November 2009 - Wine-commits

Alexandre Julliard : server: Store a duplicate of the file descriptor for file mappings.
by Alexandre Julliard 24 Nov '09

24 Nov '09

Module: wine Branch: master Commit: 5f808f03e1bc379fb02eaf4b16a43247410c7003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f808f03e1bc379fb02eaf4b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 23 16:16:46 2009 +0100 server: Store a duplicate of the file descriptor for file mappings. --- server/fd.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ server/file.h | 4 +++ server/mapping.c | 30 +++++++++++++++++++++++- 3 files changed, 97 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index f57ed97..a4018ee 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1488,6 +1488,59 @@ struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *use return fd; } +/* duplicate an fd object for a different user */ +struct fd *dup_fd_object( struct fd *orig ) +{ + struct fd *fd = alloc_object( &fd_ops ); + + if (!fd) return NULL; + + fd->fd_ops = NULL; + fd->user = NULL; + fd->inode = NULL; + fd->closed = NULL; + fd->access = orig->access; + fd->options = orig->options; + fd->sharing = orig->sharing; + fd->unix_fd = -1; + fd->signaled = 0; + fd->fs_locks = 0; + fd->poll_index = -1; + fd->read_q = NULL; + fd->write_q = NULL; + fd->wait_q = NULL; + fd->completion = NULL; + list_init( &fd->inode_entry ); + list_init( &fd->locks ); + + if (!(fd->unix_name = mem_alloc( strlen(orig->unix_name) + 1 ))) goto failed; + strcpy( fd->unix_name, orig->unix_name ); + if ((fd->poll_index = add_poll_user( fd )) == -1) goto failed; + + if (orig->inode) + { + struct closed_fd *closed = mem_alloc( sizeof(*closed) ); + if (!closed) goto failed; + if ((fd->unix_fd = dup( orig->unix_fd )) == -1) + { + free( closed ); + goto failed; + } + closed->unix_fd = fd->unix_fd; + closed->unlink[0] = 0; + fd->closed = closed; + fd->inode = (struct inode *)grab_object( orig->inode ); + list_add_head( &fd->inode->open, &fd->inode_entry ); + } + else if ((fd->unix_fd = dup( orig->unix_fd )) == -1) goto failed; + + return fd; + +failed: + release_object( fd ); + return NULL; +} + /* set the status to return when the fd has no associated unix fd */ void set_no_fd_status( struct fd *fd, unsigned int status ) { @@ -1839,6 +1892,11 @@ void fd_reselect_async( struct fd *fd, struct async_queue *queue ) fd->fd_ops->reselect_async( fd, queue ); } +void no_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) +{ + set_error( STATUS_OBJECT_TYPE_MISMATCH ); +} + void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) { struct async *async; @@ -1927,6 +1985,13 @@ static void unmount_device( struct fd *device_fd ) release_object( device ); } +obj_handle_t no_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, + int blocking, const void *data, data_size_t size ) +{ + set_error( STATUS_OBJECT_TYPE_MISMATCH ); + return 0; +} + /* default ioctl() routine */ obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking, const void *data, data_size_t size ) diff --git a/server/file.h b/server/file.h index 21b3879..27aed39 100644 --- a/server/file.h +++ b/server/file.h @@ -58,6 +58,7 @@ extern struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned i unsigned int sharing, unsigned int options ); extern struct fd *create_anonymous_fd( const struct fd_ops *fd_user_ops, int unix_fd, struct object *user, unsigned int options ); +extern struct fd *dup_fd_object( struct fd *orig ); extern void *get_fd_user( struct fd *fd ); extern void set_fd_user( struct fd *fd, const struct fd_ops *ops, struct object *user ); extern unsigned int get_fd_options( struct fd *fd ); @@ -79,8 +80,11 @@ extern void default_poll_event( struct fd *fd, int event ); extern struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); +extern obj_handle_t no_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, + int blocking, const void *data, data_size_t size ); extern obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking, const void *data, data_size_t size ); +extern void no_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); extern void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); extern void default_fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern void default_fd_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb ); diff --git a/server/mapping.c b/server/mapping.c index 67760c9..e3f69a8 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -70,6 +70,7 @@ static struct object_type *mapping_get_type( struct object *obj ); static struct fd *mapping_get_fd( struct object *obj ); static unsigned int mapping_map_access( struct object *obj, unsigned int access ); static void mapping_destroy( struct object *obj ); +static enum server_fd_type mapping_get_fd_type( struct fd *fd ); static const struct object_ops mapping_ops = { @@ -91,6 +92,18 @@ static const struct object_ops mapping_ops = mapping_destroy /* destroy */ }; +static const struct fd_ops mapping_fd_ops = +{ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ + no_flush, /* flush */ + mapping_get_fd_type, /* get_fd_type */ + no_fd_ioctl, /* ioctl */ + no_fd_queue_async, /* queue_async */ + default_fd_reselect_async, /* reselect_async */ + default_fd_cancel_async /* cancel_async */ +}; + static struct list shared_list = LIST_INIT(shared_list); #ifdef __i386__ @@ -396,6 +409,8 @@ static struct object *create_mapping( struct directory *root, const struct unico obj_handle_t handle, const struct security_descriptor *sd ) { struct mapping *mapping; + struct file *file; + struct fd *fd; int access = 0; int unix_fd; struct stat st; @@ -428,8 +443,14 @@ static struct object *create_mapping( struct directory *root, const struct unico set_error( STATUS_INVALID_PARAMETER ); goto error; } - if (!(mapping->file = get_file_obj( current->process, handle, access ))) goto error; - mapping->fd = get_obj_fd( (struct object *)mapping->file ); + if (!(file = get_file_obj( current->process, handle, access ))) goto error; + fd = get_obj_fd( (struct object *)file ); + mapping->fd = dup_fd_object( fd ); + release_object( file ); + release_object( fd ); + if (!mapping->fd) goto error; + + set_fd_user( mapping->fd, &mapping_fd_ops, &mapping->obj ); if ((unix_fd = get_unix_fd( mapping->fd )) == -1) goto error; if (protect & VPROT_IMAGE) { @@ -527,6 +548,11 @@ static void mapping_destroy( struct object *obj ) free( mapping->committed ); } +static enum server_fd_type mapping_get_fd_type( struct fd *fd ) +{ + return FD_TYPE_FILE; +} + int get_page_size(void) { if (!page_mask) init_page_size();

1 0

Alexandre Julliard : server: Moved the create_temp_file function to mapping .c.
by Alexandre Julliard 24 Nov '09

24 Nov '09

Module: wine Branch: master Commit: 62eda39fc19589140bca432042b888ed4ffb149e URL: http://source.winehq.org/git/wine.git/?a=commit;h=62eda39fc19589140bca43204… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 23 16:20:15 2009 +0100 server: Moved the create_temp_file function to mapping.c. --- server/file.c | 19 +------------------ server/file.h | 2 +- server/mapping.c | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/server/file.c b/server/file.c index 01fefdb..c09ddc5 100644 --- a/server/file.c +++ b/server/file.c @@ -115,7 +115,7 @@ static inline int is_overlapped( const struct file *file ) /* create a file from a file descriptor */ /* if the function fails the fd is closed */ -static struct file *create_file_for_fd( int fd, unsigned int access, unsigned int sharing ) +struct file *create_file_for_fd( int fd, unsigned int access, unsigned int sharing ) { struct file *file; struct stat st; @@ -226,23 +226,6 @@ int is_same_file( struct file *file1, struct file *file2 ) return is_same_file_fd( file1->fd, file2->fd ); } -/* create a temp file for anonymous mappings */ -struct file *create_temp_file( int access ) -{ - char tmpfn[16]; - int fd; - - sprintf( tmpfn, "anonmap.XXXXXX" ); /* create it in the server directory */ - fd = mkstemps( tmpfn, 0 ); - if (fd == -1) - { - file_set_error(); - return NULL; - } - unlink( tmpfn ); - return create_file_for_fd( fd, access, 0 ); -} - static void file_dump( struct object *obj, int verbose ) { struct file *file = (struct file *)obj; diff --git a/server/file.h b/server/file.h index 27aed39..1ace6f7 100644 --- a/server/file.h +++ b/server/file.h @@ -113,8 +113,8 @@ extern struct file *get_file_obj( struct process *process, obj_handle_t handle, unsigned int access ); extern int get_file_unix_fd( struct file *file ); extern int is_same_file( struct file *file1, struct file *file2 ); +extern struct file *create_file_for_fd( int fd, unsigned int access, unsigned int sharing ); extern struct file *grab_file_unless_removable( struct file *file ); -extern struct file *create_temp_file( int access ); extern void file_set_error(void); extern struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID *group ); extern mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ); diff --git a/server/mapping.c b/server/mapping.c index e3f69a8..b6211bf 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -162,6 +162,23 @@ static int grow_file( int unix_fd, file_pos_t new_size ) return 0; } +/* create a temp file for anonymous mappings */ +static struct file *create_temp_file( unsigned int access ) +{ + char tmpfn[16]; + int fd; + + sprintf( tmpfn, "anonmap.XXXXXX" ); /* create it in the server directory */ + fd = mkstemps( tmpfn, 0 ); + if (fd == -1) + { + file_set_error(); + return NULL; + } + unlink( tmpfn ); + return create_file_for_fd( fd, access, 0 ); +} + /* find the shared PE mapping for a given mapping */ static struct file *get_shared_file( struct mapping *mapping ) {

1 0

Alexandre Julliard : server: Don' t create a file object for anonymous mappings.
by Alexandre Julliard 24 Nov '09

24 Nov '09

Module: wine Branch: master Commit: 028bca4cc5f8f1f4130a448c795e9e4e0d15eb16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=028bca4cc5f8f1f4130a448c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 23 16:28:45 2009 +0100 server: Don't create a file object for anonymous mappings. --- server/mapping.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index b6211bf..1f60e88 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -57,7 +57,6 @@ struct mapping mem_size_t size; /* mapping size */ int protect; /* protection flags */ struct fd *fd; /* fd for mapped file */ - struct file *file; /* file mapped */ int header_size; /* size of headers (for PE image mapping) */ client_ptr_t base; /* default base addr (for PE image mapping) */ struct ranges *committed; /* list of committed ranges in this mapping */ @@ -163,20 +162,24 @@ static int grow_file( int unix_fd, file_pos_t new_size ) } /* create a temp file for anonymous mappings */ -static struct file *create_temp_file( unsigned int access ) +static int create_temp_file( file_pos_t size ) { char tmpfn[16]; int fd; sprintf( tmpfn, "anonmap.XXXXXX" ); /* create it in the server directory */ fd = mkstemps( tmpfn, 0 ); - if (fd == -1) + if (fd != -1) { - file_set_error(); - return NULL; + if (!grow_file( fd, size )) + { + close( fd ); + fd = -1; + } + unlink( tmpfn ); } - unlink( tmpfn ); - return create_file_for_fd( fd, access, 0 ); + else file_set_error(); + return fd; } /* find the shared PE mapping for a given mapping */ @@ -310,9 +313,9 @@ static int build_shared_mapping( struct mapping *mapping, int fd, /* create a temp file for the mapping */ - if (!(mapping->shared_file = create_temp_file( FILE_GENERIC_READ|FILE_GENERIC_WRITE ))) return 0; - if ((shared_fd = get_file_unix_fd( mapping->shared_file )) == -1) goto error; - if (!grow_file( shared_fd, total_size )) goto error; + if ((shared_fd = create_temp_file( total_size )) == -1) return 0; + if (!(mapping->shared_file = create_file_for_fd( shared_fd, FILE_GENERIC_READ|FILE_GENERIC_WRITE, 0 ))) + return 0; if (!(buffer = malloc( max_size ))) goto error; @@ -446,7 +449,6 @@ static struct object *create_mapping( struct directory *root, const struct unico mapping->header_size = 0; mapping->base = 0; mapping->fd = NULL; - mapping->file = NULL; mapping->shared_file = NULL; mapping->committed = NULL; @@ -502,10 +504,9 @@ static struct object *create_mapping( struct directory *root, const struct unico mapping->committed->count = 0; mapping->committed->max = 8; } - if (!(mapping->file = create_temp_file( access ))) goto error; - mapping->fd = get_obj_fd( (struct object *)mapping->file ); - if ((unix_fd = get_unix_fd( mapping->fd )) == -1) goto error; - if (!grow_file( unix_fd, size )) goto error; + if ((unix_fd = create_temp_file( size )) == -1) goto error; + if (!(mapping->fd = create_anonymous_fd( &mapping_fd_ops, unix_fd, &mapping->obj, + FILE_SYNCHRONOUS_IO_NONALERT ))) goto error; } mapping->size = (size + page_mask) & ~((mem_size_t)page_mask); mapping->protect = protect; @@ -555,7 +556,6 @@ static void mapping_destroy( struct object *obj ) { struct mapping *mapping = (struct mapping *)obj; assert( obj->ops == &mapping_ops ); - if (mapping->file) release_object( mapping->file ); if (mapping->fd) release_object( mapping->fd ); if (mapping->shared_file) {

1 0

Alexandre Julliard : server: Implement the special file sharing rules for memory mappings.
by Alexandre Julliard 24 Nov '09

24 Nov '09

Module: wine Branch: master Commit: fd504b62899bb8d5d01a2f064ccd368fe7aa6297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd504b62899bb8d5d01a2f064… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 23 17:09:08 2009 +0100 server: Implement the special file sharing rules for memory mappings. --- dlls/kernel32/tests/file.c | 22 ++++++++++++++-------- server/fd.c | 16 +++++++++------- server/file.h | 7 ++++++- server/mapping.c | 10 +++++++++- 4 files changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 63e6e78..dc95f63 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1827,16 +1827,16 @@ static void test_file_sharing(void) if (h2 == INVALID_HANDLE_VALUE) { if (is_sharing_map_compatible(mapping_modes[a1], access_modes[a2], sharing_modes[s2])) - todo_wine ok( is_win9x, /* there's no sharing at all with a mapping on win9x */ - "open failed for modes map %x/%x/%x\n", - mapping_modes[a1], access_modes[a2], sharing_modes[s2] ); + ok( is_win9x, /* there's no sharing at all with a mapping on win9x */ + "open failed for modes map %x/%x/%x\n", + mapping_modes[a1], access_modes[a2], sharing_modes[s2] ); ok( ret == ERROR_SHARING_VIOLATION, "wrong error code %d\n", ret ); } else { if (!is_sharing_map_compatible(mapping_modes[a1], access_modes[a2], sharing_modes[s2])) - todo_wine ok( broken(1), /* no checking on nt4 */ + ok( broken(1), /* no checking on nt4 */ "open succeeded for modes map %x/%x/%x\n", mapping_modes[a1], access_modes[a2], sharing_modes[s2] ); ok( ret == 0xdeadbeef /* Win9x */ || @@ -1852,11 +1852,17 @@ static void test_file_sharing(void) h2 = CreateFileA( filename, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0 ); ret = GetLastError(); - ok( h2 == INVALID_HANDLE_VALUE, "create succeeded for map %x\n", mapping_modes[a1] ); if ((mapping_modes[a1] & SEC_IMAGE) || is_win9x) + { + ok( h2 == INVALID_HANDLE_VALUE, "create succeeded for map %x\n", mapping_modes[a1] ); ok( ret == ERROR_SHARING_VIOLATION, "wrong error code %d for %x\n", ret, mapping_modes[a1] ); + } else todo_wine + { + ok( h2 == INVALID_HANDLE_VALUE, "create succeeded for map %x\n", mapping_modes[a1] ); ok( ret == ERROR_USER_MAPPED_FILE, "wrong error code %d for %x\n", ret, mapping_modes[a1] ); + } + if (h2 != INVALID_HANDLE_VALUE) CloseHandle( h2 ); /* try DELETE_ON_CLOSE over an existing mapping */ SetLastError(0xdeadbeef); @@ -1868,12 +1874,12 @@ static void test_file_sharing(void) ok( h2 == INVALID_HANDLE_VALUE, "create succeeded for map %x\n", mapping_modes[a1] ); ok( ret == ERROR_SHARING_VIOLATION, "wrong error code %d for %x\n", ret, mapping_modes[a1] ); } - else if (mapping_modes[a1] & SEC_IMAGE) + else if (mapping_modes[a1] & SEC_IMAGE) todo_wine { ok( h2 == INVALID_HANDLE_VALUE, "create succeeded for map %x\n", mapping_modes[a1] ); - todo_wine ok( ret == ERROR_ACCESS_DENIED, "wrong error code %d for %x\n", ret, mapping_modes[a1] ); + ok( ret == ERROR_ACCESS_DENIED, "wrong error code %d for %x\n", ret, mapping_modes[a1] ); } - else todo_wine + else { ok( h2 != INVALID_HANDLE_VALUE, "open failed for map %x err %u\n", mapping_modes[a1], ret ); } diff --git a/server/fd.c b/server/fd.c index a4018ee..7d15138 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1489,7 +1489,7 @@ struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *use } /* duplicate an fd object for a different user */ -struct fd *dup_fd_object( struct fd *orig ) +struct fd *dup_fd_object( struct fd *orig, unsigned int access, unsigned int sharing, unsigned int options ) { struct fd *fd = alloc_object( &fd_ops ); @@ -1499,9 +1499,9 @@ struct fd *dup_fd_object( struct fd *orig ) fd->user = NULL; fd->inode = NULL; fd->closed = NULL; - fd->access = orig->access; - fd->options = orig->options; - fd->sharing = orig->sharing; + fd->access = access; + fd->options = options; + fd->sharing = sharing; fd->unix_fd = -1; fd->signaled = 0; fd->fs_locks = 0; @@ -1555,8 +1555,6 @@ static int check_sharing( struct fd *fd, unsigned int access, unsigned int shari unsigned int existing_access = 0; struct list *ptr; - /* if access mode is 0, sharing mode is ignored */ - if (!access) sharing = existing_sharing; fd->access = access; fd->sharing = sharing; @@ -1565,7 +1563,8 @@ static int check_sharing( struct fd *fd, unsigned int access, unsigned int shari struct fd *fd_ptr = LIST_ENTRY( ptr, struct fd, inode_entry ); if (fd_ptr != fd) { - existing_sharing &= fd_ptr->sharing; + /* if access mode is 0, sharing mode is ignored */ + if (fd_ptr->access) existing_sharing &= fd_ptr->sharing; existing_access |= fd_ptr->access; } } @@ -1573,6 +1572,9 @@ static int check_sharing( struct fd *fd, unsigned int access, unsigned int shari if ((access & FILE_UNIX_READ_ACCESS) && !(existing_sharing & FILE_SHARE_READ)) return 0; if ((access & FILE_UNIX_WRITE_ACCESS) && !(existing_sharing & FILE_SHARE_WRITE)) return 0; if ((access & DELETE) && !(existing_sharing & FILE_SHARE_DELETE)) return 0; + if ((existing_access & FILE_MAPPING_WRITE) && !(sharing & FILE_SHARE_WRITE)) return 0; + if ((existing_access & FILE_MAPPING_IMAGE) && (access & FILE_SHARE_WRITE)) return 0; + if (!access) return 1; /* if access mode is 0, sharing mode is ignored (except for mappings) */ if ((existing_access & FILE_UNIX_READ_ACCESS) && !(sharing & FILE_SHARE_READ)) return 0; if ((existing_access & FILE_UNIX_WRITE_ACCESS) && !(sharing & FILE_SHARE_WRITE)) return 0; if ((existing_access & DELETE) && !(sharing & FILE_SHARE_DELETE)) return 0; diff --git a/server/file.h b/server/file.h index 1ace6f7..91dd034 100644 --- a/server/file.h +++ b/server/file.h @@ -58,7 +58,8 @@ extern struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned i unsigned int sharing, unsigned int options ); extern struct fd *create_anonymous_fd( const struct fd_ops *fd_user_ops, int unix_fd, struct object *user, unsigned int options ); -extern struct fd *dup_fd_object( struct fd *orig ); +extern struct fd *dup_fd_object( struct fd *orig, unsigned int access, unsigned int sharing, + unsigned int options ); extern void *get_fd_user( struct fd *fd ); extern void set_fd_user( struct fd *fd, const struct fd_ops *ops, struct object *user ); extern unsigned int get_fd_options( struct fd *fd ); @@ -158,4 +159,8 @@ extern void fd_copy_completion( struct fd *src, struct fd *dst ); /* access rights that require Unix write permission */ #define FILE_UNIX_WRITE_ACCESS (FILE_WRITE_DATA|FILE_WRITE_ATTRIBUTES|FILE_WRITE_EA) +/* magic file access rights for mappings */ +#define FILE_MAPPING_IMAGE 0x80000000 +#define FILE_MAPPING_WRITE 0x40000000 + #endif /* __WINE_SERVER_FILE_H */ diff --git a/server/mapping.c b/server/mapping.c index 1f60e88..d8bc527 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -457,6 +457,8 @@ static struct object *create_mapping( struct directory *root, const struct unico if (handle) { + unsigned int mapping_access = 0; + if (!(protect & VPROT_COMMITTED)) { set_error( STATUS_INVALID_PARAMETER ); @@ -464,7 +466,13 @@ static struct object *create_mapping( struct directory *root, const struct unico } if (!(file = get_file_obj( current->process, handle, access ))) goto error; fd = get_obj_fd( (struct object *)file ); - mapping->fd = dup_fd_object( fd ); + + /* file sharing rules for mappings are different so we use magic the access rights */ + if (protect & VPROT_IMAGE) mapping_access |= FILE_MAPPING_IMAGE; + else if (protect & VPROT_WRITE) mapping_access |= FILE_MAPPING_WRITE; + mapping->fd = dup_fd_object( fd, mapping_access, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT ); release_object( file ); release_object( fd ); if (!mapping->fd) goto error;

1 0

Alexandre Julliard : server: Implement the file sharing check when truncating a file that has an existing mapping .
by Alexandre Julliard 24 Nov '09

24 Nov '09

Module: wine Branch: master Commit: 923d582f0769af65dc79bf6cad884e96989c8915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=923d582f0769af65dc79bf6ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 23 17:24:09 2009 +0100 server: Implement the file sharing check when truncating a file that has an existing mapping. --- dlls/kernel32/tests/file.c | 12 +++++------- server/fd.c | 33 ++++++++++++++++++++------------- server/file.h | 5 +++-- server/mapping.c | 2 +- server/trace.c | 1 + 5 files changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index dc95f63..35ca3c6 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -649,12 +649,10 @@ static void test_CopyFileA(void) ok(hmapfile != NULL, "CreateFileMapping: error %d\n", GetLastError()); ret = CopyFileA(source, dest, FALSE); - todo_wine { - ok(!ret, "CopyFileA: expected failure\n"); - ok(GetLastError() == ERROR_USER_MAPPED_FILE || - broken(GetLastError() == ERROR_SHARING_VIOLATION), /* Win9x and WinMe */ - "CopyFileA with mapped dest file: expected ERROR_USER_MAPPED_FILE, got %d\n", GetLastError()); - } + ok(!ret, "CopyFileA: expected failure\n"); + ok(GetLastError() == ERROR_USER_MAPPED_FILE || + broken(GetLastError() == ERROR_SHARING_VIOLATION), /* Win9x */ + "CopyFileA with mapped dest file: expected ERROR_USER_MAPPED_FILE, got %d\n", GetLastError()); CloseHandle(hmapfile); CloseHandle(hfile); @@ -1857,7 +1855,7 @@ static void test_file_sharing(void) ok( h2 == INVALID_HANDLE_VALUE, "create succeeded for map %x\n", mapping_modes[a1] ); ok( ret == ERROR_SHARING_VIOLATION, "wrong error code %d for %x\n", ret, mapping_modes[a1] ); } - else todo_wine + else { ok( h2 == INVALID_HANDLE_VALUE, "create succeeded for map %x\n", mapping_modes[a1] ); ok( ret == ERROR_USER_MAPPED_FILE, "wrong error code %d for %x\n", ret, mapping_modes[a1] ); diff --git a/server/fd.c b/server/fd.c index 7d15138..ee1a9d3 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1549,7 +1549,8 @@ void set_no_fd_status( struct fd *fd, unsigned int status ) /* check if the desired access is possible without violating */ /* the sharing mode of other opens of the same file */ -static int check_sharing( struct fd *fd, unsigned int access, unsigned int sharing ) +static unsigned int check_sharing( struct fd *fd, unsigned int access, unsigned int sharing, + unsigned int open_flags, unsigned int options ) { unsigned int existing_sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; unsigned int existing_access = 0; @@ -1569,16 +1570,21 @@ static int check_sharing( struct fd *fd, unsigned int access, unsigned int shari } } - if ((access & FILE_UNIX_READ_ACCESS) && !(existing_sharing & FILE_SHARE_READ)) return 0; - if ((access & FILE_UNIX_WRITE_ACCESS) && !(existing_sharing & FILE_SHARE_WRITE)) return 0; - if ((access & DELETE) && !(existing_sharing & FILE_SHARE_DELETE)) return 0; - if ((existing_access & FILE_MAPPING_WRITE) && !(sharing & FILE_SHARE_WRITE)) return 0; - if ((existing_access & FILE_MAPPING_IMAGE) && (access & FILE_SHARE_WRITE)) return 0; - if (!access) return 1; /* if access mode is 0, sharing mode is ignored (except for mappings) */ - if ((existing_access & FILE_UNIX_READ_ACCESS) && !(sharing & FILE_SHARE_READ)) return 0; - if ((existing_access & FILE_UNIX_WRITE_ACCESS) && !(sharing & FILE_SHARE_WRITE)) return 0; - if ((existing_access & DELETE) && !(sharing & FILE_SHARE_DELETE)) return 0; - return 1; + if (((access & FILE_UNIX_READ_ACCESS) && !(existing_sharing & FILE_SHARE_READ)) || + ((access & FILE_UNIX_WRITE_ACCESS) && !(existing_sharing & FILE_SHARE_WRITE)) || + ((access & DELETE) && !(existing_sharing & FILE_SHARE_DELETE))) + return STATUS_SHARING_VIOLATION; + if (((existing_access & FILE_MAPPING_WRITE) && !(sharing & FILE_SHARE_WRITE)) || + ((existing_access & FILE_MAPPING_IMAGE) && (access & FILE_SHARE_WRITE))) + return STATUS_SHARING_VIOLATION; + if ((existing_access & FILE_MAPPING_ACCESS) && (open_flags & O_TRUNC)) + return STATUS_USER_MAPPED_FILE; + if (!access) return 0; /* if access mode is 0, sharing mode is ignored (except for mappings) */ + if (((existing_access & FILE_UNIX_READ_ACCESS) && !(sharing & FILE_SHARE_READ)) || + ((existing_access & FILE_UNIX_WRITE_ACCESS) && !(sharing & FILE_SHARE_WRITE)) || + ((existing_access & DELETE) && !(sharing & FILE_SHARE_DELETE))) + return STATUS_SHARING_VIOLATION; + return 0; } /* sets the user of an fd that previously had no user */ @@ -1659,6 +1665,7 @@ struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned int acce /* only bother with an inode for normal files and directories */ if (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)) { + unsigned int err; struct inode *inode = get_inode( st.st_dev, st.st_ino, fd->unix_fd ); if (!inode) @@ -1685,10 +1692,10 @@ struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned int acce set_error( STATUS_FILE_IS_A_DIRECTORY ); return NULL; } - if (!check_sharing( fd, access, sharing )) + if ((err = check_sharing( fd, access, sharing, flags, options ))) { release_object( fd ); - set_error( STATUS_SHARING_VIOLATION ); + set_error( err ); return NULL; } strcpy( closed_fd->unlink, unlink_name ); diff --git a/server/file.h b/server/file.h index 91dd034..a49fc4d 100644 --- a/server/file.h +++ b/server/file.h @@ -160,7 +160,8 @@ extern void fd_copy_completion( struct fd *src, struct fd *dst ); #define FILE_UNIX_WRITE_ACCESS (FILE_WRITE_DATA|FILE_WRITE_ATTRIBUTES|FILE_WRITE_EA) /* magic file access rights for mappings */ -#define FILE_MAPPING_IMAGE 0x80000000 -#define FILE_MAPPING_WRITE 0x40000000 +#define FILE_MAPPING_IMAGE 0x80000000 /* set for SEC_IMAGE mappings */ +#define FILE_MAPPING_WRITE 0x40000000 /* set for writable shared mappings */ +#define FILE_MAPPING_ACCESS 0x20000000 /* set for all mappings */ #endif /* __WINE_SERVER_FILE_H */ diff --git a/server/mapping.c b/server/mapping.c index d8bc527..1cf53b9 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -457,7 +457,7 @@ static struct object *create_mapping( struct directory *root, const struct unico if (handle) { - unsigned int mapping_access = 0; + unsigned int mapping_access = FILE_MAPPING_ACCESS; if (!(protect & VPROT_COMMITTED)) { diff --git a/server/trace.c b/server/trace.c index a4b1faa..6c503f9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4629,6 +4629,7 @@ static const struct { "TOO_MANY_OPENED_FILES", STATUS_TOO_MANY_OPENED_FILES }, { "UNSUCCESSFUL", STATUS_UNSUCCESSFUL }, { "USER_APC", STATUS_USER_APC }, + { "USER_MAPPED_FILE", STATUS_USER_MAPPED_FILE }, { "VOLUME_DISMOUNTED", STATUS_VOLUME_DISMOUNTED }, { "WAS_LOCKED", STATUS_WAS_LOCKED }, { NULL, 0 }

1 0

Alexandre Julliard : server: Implement the file sharing check for delete on close with an existing image mapping .
by Alexandre Julliard 24 Nov '09

24 Nov '09

Module: wine Branch: master Commit: 181b3cf07f3d9ed2e23dac4c21230c37435c3b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=181b3cf07f3d9ed2e23dac4c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 23 17:29:14 2009 +0100 server: Implement the file sharing check for delete on close with an existing image mapping. --- dlls/kernel32/tests/file.c | 2 +- server/fd.c | 2 ++ server/trace.c | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 35ca3c6..3d0e258 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1872,7 +1872,7 @@ static void test_file_sharing(void) ok( h2 == INVALID_HANDLE_VALUE, "create succeeded for map %x\n", mapping_modes[a1] ); ok( ret == ERROR_SHARING_VIOLATION, "wrong error code %d for %x\n", ret, mapping_modes[a1] ); } - else if (mapping_modes[a1] & SEC_IMAGE) todo_wine + else if (mapping_modes[a1] & SEC_IMAGE) { ok( h2 == INVALID_HANDLE_VALUE, "create succeeded for map %x\n", mapping_modes[a1] ); ok( ret == ERROR_ACCESS_DENIED, "wrong error code %d for %x\n", ret, mapping_modes[a1] ); diff --git a/server/fd.c b/server/fd.c index ee1a9d3..9d2ac9d 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1577,6 +1577,8 @@ static unsigned int check_sharing( struct fd *fd, unsigned int access, unsigned if (((existing_access & FILE_MAPPING_WRITE) && !(sharing & FILE_SHARE_WRITE)) || ((existing_access & FILE_MAPPING_IMAGE) && (access & FILE_SHARE_WRITE))) return STATUS_SHARING_VIOLATION; + if ((existing_access & FILE_MAPPING_IMAGE) && (options & FILE_DELETE_ON_CLOSE)) + return STATUS_CANNOT_DELETE; if ((existing_access & FILE_MAPPING_ACCESS) && (open_flags & O_TRUNC)) return STATUS_USER_MAPPED_FILE; if (!access) return 0; /* if access mode is 0, sharing mode is ignored (except for mappings) */ diff --git a/server/trace.c b/server/trace.c index 6c503f9..6cb4cc9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4555,6 +4555,7 @@ static const struct { "BUFFER_OVERFLOW", STATUS_BUFFER_OVERFLOW }, { "BUFFER_TOO_SMALL", STATUS_BUFFER_TOO_SMALL }, { "CANCELLED", STATUS_CANCELLED }, + { "CANNOT_DELETE", STATUS_CANNOT_DELETE }, { "CANT_OPEN_ANONYMOUS", STATUS_CANT_OPEN_ANONYMOUS }, { "CHILD_MUST_BE_VOLATILE", STATUS_CHILD_MUST_BE_VOLATILE }, { "DEBUGGER_INACTIVE", STATUS_DEBUGGER_INACTIVE },

1 0

Jacek Caban : mshtml: Forward common function from IHTMLAnchorElement to IHTMLElement2 implementation .
by Alexandre Julliard 24 Nov '09

24 Nov '09

Module: wine Branch: master Commit: 2f0373d2659be8b1dcc5eb2e25260d8fb28f51a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0373d2659be8b1dcc5eb2e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 23 15:37:26 2009 +0100 mshtml: Forward common function from IHTMLAnchorElement to IHTMLElement2 implementation. --- dlls/mshtml/htmlanchor.c | 60 ++++++++++++++++++++++++++++++--------------- 1 files changed, 40 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 04960d9..6bbaf26 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -313,43 +313,55 @@ static HRESULT WINAPI HTMLAnchorElement_get_hash(IHTMLAnchorElement *iface, BSTR static HRESULT WINAPI HTMLAnchorElement_put_onblur(IHTMLAnchorElement *iface, VARIANT v) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return IHTMLElement2_put_onblur(HTMLELEM2(&This->element), v); } static HRESULT WINAPI HTMLAnchorElement_get_onblur(IHTMLAnchorElement *iface, VARIANT *p) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLElement2_get_onblur(HTMLELEM2(&This->element), p); } static HRESULT WINAPI HTMLAnchorElement_put_onfocus(IHTMLAnchorElement *iface, VARIANT v) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return IHTMLElement2_put_onfocus(HTMLELEM2(&This->element), v); } static HRESULT WINAPI HTMLAnchorElement_get_onfocus(IHTMLAnchorElement *iface, VARIANT *p) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLElement2_get_onfocus(HTMLELEM2(&This->element), p); } static HRESULT WINAPI HTMLAnchorElement_put_accessKey(IHTMLAnchorElement *iface, BSTR v) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return IHTMLElement2_put_accessKey(HTMLELEM2(&This->element), v); } static HRESULT WINAPI HTMLAnchorElement_get_accessKey(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLElement2_get_accessKey(HTMLELEM2(&This->element), p); } static HRESULT WINAPI HTMLAnchorElement_get_protocolLong(IHTMLAnchorElement *iface, BSTR *p) @@ -376,29 +388,37 @@ static HRESULT WINAPI HTMLAnchorElement_get_nameProp(IHTMLAnchorElement *iface, static HRESULT WINAPI HTMLAnchorElement_put_tabIndex(IHTMLAnchorElement *iface, short v) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return IHTMLElement2_put_tabIndex(HTMLELEM2(&This->element), v); } static HRESULT WINAPI HTMLAnchorElement_get_tabIndex(IHTMLAnchorElement *iface, short *p) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLElement2_get_tabIndex(HTMLELEM2(&This->element), p); } static HRESULT WINAPI HTMLAnchorElement_focus(IHTMLAnchorElement *iface) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return IHTMLElement2_focus(HTMLELEM2(&This->element)); } static HRESULT WINAPI HTMLAnchorElement_blur(IHTMLAnchorElement *iface) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return IHTMLElement2_blur(HTMLELEM2(&This->element)); } #undef HTMLANCHOR_THIS

1 0

Marcus Meissner : LOSTWAGES: download: updated german for SUSE and Ubuntu
by Jeremy Newman 23 Nov '09

23 Nov '09

Module: website Branch: master Commit: 1f57e8661b330a0d2e0c970815a252b47178c03e URL: http://source.winehq.org/git/website.git/?a=commit;h=1f57e8661b330a0d2e0c97… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 22 08:27:48 2009 +0100 LOSTWAGES: download: updated german for SUSE and Ubuntu --- templates/de/download.template | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index ea65b4a..7730baf 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -62,7 +62,7 @@ erbeten hat, dass sie die Wine-Website hosten. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/deb">Ubuntu</a> - binär und Quellcode .debs für Ubuntu Hardy (8.04), Intrepid (8.10) und Jaunty (9.04) + binär und Quellcode .debs für Ubuntu Karmic (9.10), Jaunty (9.04), Intrepid (8.10) und Hardy (8.04) <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> @@ -103,8 +103,8 @@ erbeten hat, dass sie die Wine-Website hosten. <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">SUSE</a> - stellt binär und Quellcode .rpms und tägliche snapshot RPMs für openSUSE 10.3, 11.0, - 11.1 und SLES 9 und SLES 10 bereit. + stellt binär und Quellcode .rpms und tägliche snapshot RPMs für openSUSE 11.0, + 11.1, 11.2 sowie SLES 9, SLES 10 und SLE11 bereit. Alte Versionen sind auf <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> verfügbar. </td>

1 0

Marcus Meissner : LOSTWAGES: deb.template: translated ubuntu changes to german
by Jeremy Newman 23 Nov '09

23 Nov '09

Module: website Branch: master Commit: a131f875eeb51a034e26577d55198fffbd1cc35f URL: http://source.winehq.org/git/website.git/?a=commit;h=a131f875eeb51a034e2657… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 22 08:47:43 2009 +0100 LOSTWAGES: deb.template: translated ubuntu changes to german --- templates/de/download/deb.template | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/templates/de/download/deb.template b/templates/de/download/deb.template index bc5315e..5d5b7fd 100644 --- a/templates/de/download/deb.template +++ b/templates/de/download/deb.template @@ -32,6 +32,8 @@ von Drittanbietern-Reiter und klicke auf Hinzufügen. Dann, copy-paste eine der unteren Zeilen in Abhängigkeit welche Version du benutzt. +Für Ubuntu Karmic (9.10): +ppa:ubuntu-wine/ppa Für Ubuntu Jaunty (9.04): deb http://wine.budgetdedicated.com/apt jaunty main #WineHQ - Ubuntu 9.04 "Jaunty Jackalope" Für Ubuntu Intrepid (8.10): @@ -39,12 +41,13 @@ Version du benutzt. Für Ubuntu Hardy (8.04): deb http://wine.budgetdedicated.com/apt hardy main #WineHQ - Ubuntu 8.04 "Hardy Heron" -<h2>Vertrauen des WineHQ APT Repositorys und Installation von Wine:</h2> +<h2>Vertrauen des WineHQ APT Repositorys:</h2> -Nach dem Hinzufügen des Repository, musst du auch noch den Schlüssel für das Repository +Nach dem Hinzufügen des Repository musst du auch noch den Schlüssel für das Repository zu der Liste der vertrauenswürdigen Schlüssel deines Systems hinzufügen. +Ubuntu Karmic User können diesen Schritt überspringen. -<a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">Lade +Für Ubuntu 9.04 und ältere: <a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">Lade und speichere Scott Ritchie's Schlüssel</a> (Rechtsklick -> Speichern unter...) auf deinen Desktop. Öffne dann den Authentifizierung-Reiter, klickeSchlüsseldatei importieren und wähle die Schlüsseldatei, @@ -53,6 +56,8 @@ diesem Schritt zu löschen. <img src="{$root}/images/distro/de_ubuntu-softwaresources2.png" width="686" height="514" alt="System->Systemverwaltung->Software-Paketquellen" border="0"> +<h2>Installieren von Wine:</h2> + Klick auf Schließen zum Beenden, anschließend lade die Paketinformationen neu, wenn Du dazu aufgefordert wirst. Wenn Du Wine installiert hast, wird die Aktualisierungsverwaltung des Systems Dich nun über den aktuellen Wine Betarelease informieren und dich zum Aktualisieren @@ -90,6 +95,8 @@ in das Terminal copy-pastest.: Danach, füge das Repository zu den APT-Quellen Deines Systems hinzu: +Für Ubuntu Karmic (9.10): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/karmic.list -O /etc/apt/sources.list.d/winehq.list Für Ubuntu Jaunty (9.04): sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/jaunty.list -O /etc/apt/sources.list.d/winehq.list Für Ubuntu Intrepid (8.10):

1 0

Jörg Höhle : winmm/tests: Introduce coherence tests among parts that may fail.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 11f07c6f6bba6f551c0be24acfeabb64b41c0ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f07c6f6bba6f551c0be24ac… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Nov 18 21:59:08 2009 +0100 winmm/tests: Introduce coherence tests among parts that may fail. --- dlls/winmm/tests/mci.c | 51 ++++++++++++++++++++++++++++++----------------- 1 files changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index bbf33bc..c72c81d 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -25,6 +25,10 @@ #include "mmreg.h" #include "wine/test.h" +/* The tests use the MCI's own save capability to create the tempfile.wav to play. + * To use a pre-existing file, write-protect it. */ +static MCIERROR ok_saved = MCIERR_FILE_NOT_FOUND; + typedef union { MCI_STATUS_PARMS status; MCI_WAVE_SET_PARMS set; @@ -244,7 +248,7 @@ static void test_recordWAVE(HWND hwnd) WORD nch = 1; WORD nbits = 16; DWORD nsamp = 16000, expect; - MCIERROR err; + MCIERROR err, ok_pcm; MCIDEVICEID wDeviceID; MCI_PARMS_UNION parm; char buf[1024]; @@ -289,9 +293,10 @@ static void test_recordWAVE(HWND hwnd) * Don't skip here, record will fail below. */ err = mciSendString("set x format tag pcm", NULL, 0, NULL); ok(!err || err==MCIERR_OUTOFRANGE,"mci set format tag pcm returned %s\n", dbg_mcierr(err)); + ok_pcm = err; err = mciSendString("set x samplespersec 41000 alignment 4 channels 2", NULL, 0, NULL); - ok(!err,"mci set samples+align+channels returned %s\n", dbg_mcierr(err)); + ok(err==ok_pcm,"mci set samples+align+channels returned %s\n", dbg_mcierr(err)); /* Investigate: on w2k, set samplespersec 22050 sets nChannels to 2! * err = mciSendString("set x samplespersec 22050", NULL, 0, NULL); @@ -308,12 +313,16 @@ static void test_recordWAVE(HWND hwnd) MCI_WAVE_SET_SAMPLESPERSEC | MCI_WAVE_SET_CHANNELS | MCI_WAVE_SET_BITSPERSAMPLE | MCI_WAVE_SET_BLOCKALIGN | MCI_WAVE_SET_AVGBYTESPERSEC| MCI_WAVE_SET_FORMATTAG, (DWORD_PTR)&parm); - ok(!err || err==MCIERR_OUTOFRANGE,"mciCommand set wave format: %s\n", dbg_mcierr(err)); + ok(err==ok_pcm,"mciCommand set wave format: %s\n", dbg_mcierr(err)); + /* A few ME machines pass all tests except set format tag pcm! */ err = mciSendString("record x to 2000 wait", NULL, 0, hwnd); - ok(!err,"mci record to 2000 returned %s\n", dbg_mcierr(err)); - if(err==MCIERR_WAVE_INPUTSUNSUITABLE) { - skip("Please install audio driver. Tests will fail\n"); + ok(err || !ok_pcm,"can record yet set wave format pcm returned %s\n", dbg_mcierr(ok_pcm)); + ok(!err || err==(ok_pcm==MCIERR_OUTOFRANGE ? MCIERR_WAVE_INPUTSUNSUITABLE : 0),"mci record to 2000 returned %s\n", dbg_mcierr(err)); + if(err) { + if (err==MCIERR_WAVE_INPUTSUNSUITABLE) + skip("Please install audio driver. Everything is skipped.\n"); + else skip("Cannot record cause %s. Everything is skipped.\n", dbg_mcierr(err)); err = mciSendString("close x", NULL, 0, NULL); ok(!err,"mci close returned %s\n", dbg_mcierr(err)); @@ -353,6 +362,7 @@ static void test_recordWAVE(HWND hwnd) err = mciSendString("save x tempfile.wav", NULL, 0, NULL); ok(!err,"mci save returned %s\n", dbg_mcierr(err)); + if(!err) ok_saved = 0; /* Save must not rename the original file. */ if (!DeleteFile("tempfile1.wav")) @@ -386,9 +396,9 @@ static void test_playWAVE(HWND hwnd) memset(buf, 0, sizeof(buf)); err = mciSendString("open waveaudio!tempfile.wav alias mysound", NULL, 0, NULL); - ok(!err,"mci open waveaudio!tempfile.wav returned %s\n", dbg_mcierr(err)); + ok(err==ok_saved,"mci open waveaudio!tempfile.wav returned %s\n", dbg_mcierr(err)); if(err) { - skip("Cannot open tempfile.wav for playing #1, skipping\n"); + skip("Cannot open waveaudio!tempfile.wav for playing (%s), skipping\n", dbg_mcierr(err)); return; } @@ -505,9 +515,9 @@ static void test_asyncWAVE(HWND hwnd) memset(buf, 0, sizeof(buf)); err = mciSendString("open tempfile.wav alias mysound", buf, sizeof(buf), NULL); - ok(!err,"mci open tempfile.wav returned %s\n", dbg_mcierr(err)); + ok(err==ok_saved,"mci open tempfile.wav returned %s\n", dbg_mcierr(err)); if(err) { - skip("Cannot open tempfile.wav for playing #2, skipping\n"); + skip("Cannot open tempfile.wav for playing (%s), skipping\n", dbg_mcierr(err)); return; } ok(!strcmp(buf,"1"), "mci open deviceId: %s, expected 1\n", buf); @@ -685,7 +695,7 @@ static void test_AutoOpenWAVE(HWND hwnd) /* This test used(?) to cause intermittent crashes when Wine exits, after * fixme:winmm:MMDRV_Exit Closing while ll-driver open */ - MCIERROR err; + MCIERROR err, ok_snd; char buf[512], path[300], command[330]; memset(buf, 0, sizeof(buf)); memset(path, 0, sizeof(path)); @@ -697,11 +707,12 @@ static void test_AutoOpenWAVE(HWND hwnd) ok(!err,"mci sysinfo waveaudio quantity open returned %s\n", dbg_mcierr(err)); if(!err) todo_wine ok(!strcmp(buf,"0"), "sysinfo quantity open expected 0, got: %s, some more tests will fail.\n", buf); + ok_snd = waveOutGetNumDevs() ? 0 : MCIERR_HARDWARE; err = mciSendString("sound NoSuchSoundDefined wait", NULL, 0, NULL); - todo_wine ok(!err,"mci sound NoSuchSoundDefined returned %s\n", dbg_mcierr(err)); + todo_wine ok(err==ok_snd,"mci sound NoSuchSoundDefined returned %s\n", dbg_mcierr(err)); err = mciSendString("sound SystemExclamation notify wait", NULL, 0, hwnd); - todo_wine ok(!err,"mci sound SystemExclamation returned %s\n", dbg_mcierr(err)); + todo_wine ok(err==ok_snd,"mci sound SystemExclamation returned %s\n", dbg_mcierr(err)); test_notification(hwnd, "sound notify", err ? 0 : MCI_NOTIFY_SUCCESSFUL); buf[0]=0; @@ -710,7 +721,7 @@ static void test_AutoOpenWAVE(HWND hwnd) if(!err) trace("sysinfo dangling open alias: %s\n", buf); err = mciSendString("play no-such-file-exists.wav notify", buf, sizeof(buf), NULL); - if(err==MCIERR_FILE_NOT_FOUND) { + if(err==MCIERR_FILE_NOT_FOUND) { /* a Wine detector */ /* Unsupported auto-open leaves the file open, preventing clean-up */ skip("Skipping auto-open tests in Wine\n"); return; @@ -721,7 +732,8 @@ static void test_AutoOpenWAVE(HWND hwnd) if(err) /* FIXME: don't open twice yet, it confuses Wine. */ err = mciSendString("play tempfile.wav", buf, sizeof(buf), hwnd); - ok(!err,"mci auto-open play returned %s\n", dbg_mcierr(err)); + ok(err==ok_saved,"mci auto-open play returned %s\n", dbg_mcierr(err)); + if(err==MCIERR_FILE_NOT_FOUND) { skip("Cannot open tempfile.wav for auto-play, skipping\n"); return; @@ -771,8 +783,9 @@ static void test_AutoOpenWAVE(HWND hwnd) */ err = mciSendString("status tempfile.wav mode notify", buf, sizeof(buf), hwnd); todo_wine ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN, "mci status auto-open notify returned %s\n", dbg_mcierr(err)); - if(!err) { /* Wine style */ - trace("New style MCI auto-close upon notification behaviour.\n"); + if(!err) { + trace("Wine style MCI auto-close upon notification\n"); + /* "playing" because auto-close comes after the status call. */ todo_wine ok(!strcmp(buf,"playing"), "mci auto-open status mode notify, got: %s\n", buf); /* fixme:winmm:MMDRV_Exit Closing while ll-driver open @@ -782,7 +795,7 @@ static void test_AutoOpenWAVE(HWND hwnd) Sleep(16); test_notification(hwnd,"auto-open",0); } else if(err==MCIERR_NOTIFY_ON_AUTO_OPEN) { /* MS style */ - trace("Old style MCI auto-open forbids notification behaviour.\n"); + trace("MS style MCI auto-open forbids notification\n"); err = mciSendString("pause tempfile.wav", NULL, 0, hwnd); ok(!err,"mci auto-still-open pause returned %s\n", dbg_mcierr(err)); @@ -833,6 +846,6 @@ START_TEST(mci) /* Win9X hangs when exiting with something still open. */ err = mciSendString("close all", NULL, 0, hwnd); todo_wine ok(!err,"final close all returned %s\n", dbg_mcierr(err)); - ok(DeleteFile("tempfile.wav"),"Delete tempfile.wav (cause auto-open?)\n"); + ok(DeleteFile("tempfile.wav")||ok_saved,"Delete tempfile.wav (cause auto-open?)\n"); DestroyWindow(hwnd); }

1 0