December 2009 - Wine-commits

Alexandre Julliard : ntdll: Move the directory lookup part of wine_nt_to_unix_file_name to a separate helper .
by Alexandre Julliard 02 Dec '09

02 Dec '09

Module: wine Branch: master Commit: a420a207e3d800a110531eab9d4276ebe5be9d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a420a207e3d800a110531eab9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 16:30:52 2009 +0100 ntdll: Move the directory lookup part of wine_nt_to_unix_file_name to a separate helper. --- dlls/ntdll/directory.c | 238 ++++++++++++++++++++++++----------------------- 1 files changed, 122 insertions(+), 116 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 40cc455..7833809 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2212,6 +2212,120 @@ static inline int get_dos_prefix_len( const UNICODE_STRING *name ) /****************************************************************************** + * lookup_unix_name + * + * Helper for nt_to_unix_file_name + */ +static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer, int unix_len, int pos, + UINT disposition, BOOLEAN check_case ) +{ + NTSTATUS status; + int ret, used_default, len; + struct stat st; + char *unix_name = *buffer; + const BOOL redirect = nb_redirects && ntdll_get_thread_data()->wow64_redir; + + /* try a shortcut first */ + + ret = ntdll_wcstoumbs( 0, name, name_len, unix_name + pos, unix_len - pos - 1, + NULL, &used_default ); + + while (name_len && IS_SEPARATOR(*name)) + { + name++; + name_len--; + } + + if (ret > 0 && !used_default) /* if we used the default char the name didn't convert properly */ + { + char *p; + unix_name[pos + ret] = 0; + for (p = unix_name + pos ; *p; p++) if (*p == '\\') *p = '/'; + if ((!redirect || !strstr( unix_name, "/windows/")) && !stat( unix_name, &st )) + { + /* creation fails with STATUS_ACCESS_DENIED for the root of the drive */ + if (disposition == FILE_CREATE) + return name_len ? STATUS_OBJECT_NAME_COLLISION : STATUS_ACCESS_DENIED; + return STATUS_SUCCESS; + } + } + + if (!name_len) /* empty name -> drive root doesn't exist */ + return STATUS_OBJECT_PATH_NOT_FOUND; + if (check_case && !redirect && (disposition == FILE_OPEN || disposition == FILE_OVERWRITE)) + return STATUS_OBJECT_NAME_NOT_FOUND; + + /* now do it component by component */ + + while (name_len) + { + const WCHAR *end, *next; + int is_win_dir = 0; + + end = name; + while (end < name + name_len && !IS_SEPARATOR(*end)) end++; + next = end; + while (next < name + name_len && IS_SEPARATOR(*next)) next++; + name_len -= next - name; + + /* grow the buffer if needed */ + + if (unix_len - pos < MAX_DIR_ENTRY_LEN + 2) + { + char *new_name; + unix_len += 2 * MAX_DIR_ENTRY_LEN; + if (!(new_name = RtlReAllocateHeap( GetProcessHeap(), 0, unix_name, unix_len ))) + return STATUS_NO_MEMORY; + unix_name = *buffer = new_name; + } + + status = find_file_in_dir( unix_name, pos, name, end - name, + check_case, redirect ? &is_win_dir : NULL ); + + /* if this is the last element, not finding it is not necessarily fatal */ + if (!name_len) + { + if (status == STATUS_OBJECT_PATH_NOT_FOUND) + { + status = STATUS_OBJECT_NAME_NOT_FOUND; + if (disposition != FILE_OPEN && disposition != FILE_OVERWRITE) + { + ret = ntdll_wcstoumbs( 0, name, end - name, unix_name + pos + 1, + MAX_DIR_ENTRY_LEN, NULL, &used_default ); + if (ret > 0 && !used_default) + { + unix_name[pos] = '/'; + unix_name[pos + 1 + ret] = 0; + status = STATUS_NO_SUCH_FILE; + break; + } + } + } + else if (status == STATUS_SUCCESS && disposition == FILE_CREATE) + { + status = STATUS_OBJECT_NAME_COLLISION; + } + } + + if (status != STATUS_SUCCESS) break; + + pos += strlen( unix_name + pos ); + name = next; + + if (is_win_dir && (len = get_redirect_path( unix_name, pos, name, name_len, check_case ))) + { + name += len; + name_len -= len; + pos += strlen( unix_name + pos ); + TRACE( "redirecting -> %s + %s\n", debugstr_a(unix_name), debugstr_w(name) ); + } + } + + return status; +} + + +/****************************************************************************** * wine_nt_to_unix_file_name (NTDLL.@) Not a Windows API * * Convert a file name from NT namespace to Unix namespace. @@ -2234,7 +2348,6 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI int pos, ret, name_len, unix_len, prefix_len, used_default; WCHAR prefix[MAX_DIR_ENTRY_LEN]; BOOLEAN is_unix = FALSE; - const BOOL redirect = nb_redirects && ntdll_get_thread_data()->wow64_redir; name = nameW->Buffer; name_len = nameW->Length / sizeof(WCHAR); @@ -2315,126 +2428,19 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI } } - /* try a shortcut first */ - - ret = ntdll_wcstoumbs( 0, name, name_len, unix_name + pos, unix_len - pos - 1, - NULL, &used_default ); - - while (name_len && IS_SEPARATOR(*name)) - { - name++; - name_len--; - } - - if (ret > 0 && !used_default) /* if we used the default char the name didn't convert properly */ + status = lookup_unix_name( name, name_len, &unix_name, unix_len, pos, disposition, check_case ); + if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE) { - char *p; - unix_name[pos + ret] = 0; - for (p = unix_name + pos ; *p; p++) if (*p == '\\') *p = '/'; - if ((!redirect || !strstr( unix_name, "/windows/")) && !stat( unix_name, &st )) - { - /* creation fails with STATUS_ACCESS_DENIED for the root of the drive */ - if (disposition == FILE_CREATE) - { - RtlFreeHeap( GetProcessHeap(), 0, unix_name ); - return name_len ? STATUS_OBJECT_NAME_COLLISION : STATUS_ACCESS_DENIED; - } - goto done; - } + TRACE( "%s -> %s\n", debugstr_us(nameW), debugstr_a(unix_name) ); + unix_name_ret->Buffer = unix_name; + unix_name_ret->Length = strlen(unix_name); + unix_name_ret->MaximumLength = unix_len; } - - if (!name_len) /* empty name -> drive root doesn't exist */ - { - RtlFreeHeap( GetProcessHeap(), 0, unix_name ); - return STATUS_OBJECT_PATH_NOT_FOUND; - } - if (check_case && !redirect && (disposition == FILE_OPEN || disposition == FILE_OVERWRITE)) + else { + TRACE( "%s not found in %s\n", debugstr_w(name), unix_name ); RtlFreeHeap( GetProcessHeap(), 0, unix_name ); - return STATUS_OBJECT_NAME_NOT_FOUND; - } - - /* now do it component by component */ - - while (name_len) - { - const WCHAR *end, *next; - int is_win_dir = 0; - - end = name; - while (end < name + name_len && !IS_SEPARATOR(*end)) end++; - next = end; - while (next < name + name_len && IS_SEPARATOR(*next)) next++; - name_len -= next - name; - - /* grow the buffer if needed */ - - if (unix_len - pos < MAX_DIR_ENTRY_LEN + 2) - { - char *new_name; - unix_len += 2 * MAX_DIR_ENTRY_LEN; - if (!(new_name = RtlReAllocateHeap( GetProcessHeap(), 0, unix_name, unix_len ))) - { - RtlFreeHeap( GetProcessHeap(), 0, unix_name ); - return STATUS_NO_MEMORY; - } - unix_name = new_name; - } - - status = find_file_in_dir( unix_name, pos, name, end - name, - check_case, redirect ? &is_win_dir : NULL ); - - /* if this is the last element, not finding it is not necessarily fatal */ - if (!name_len) - { - if (status == STATUS_OBJECT_PATH_NOT_FOUND) - { - status = STATUS_OBJECT_NAME_NOT_FOUND; - if (disposition != FILE_OPEN && disposition != FILE_OVERWRITE) - { - ret = ntdll_wcstoumbs( 0, name, end - name, unix_name + pos + 1, - MAX_DIR_ENTRY_LEN, NULL, &used_default ); - if (ret > 0 && !used_default) - { - unix_name[pos] = '/'; - unix_name[pos + 1 + ret] = 0; - status = STATUS_NO_SUCH_FILE; - break; - } - } - } - else if (status == STATUS_SUCCESS && disposition == FILE_CREATE) - { - status = STATUS_OBJECT_NAME_COLLISION; - } - } - - if (status != STATUS_SUCCESS) - { - /* couldn't find it at all, fail */ - TRACE( "%s not found in %s\n", debugstr_w(name), unix_name ); - RtlFreeHeap( GetProcessHeap(), 0, unix_name ); - return status; - } - - pos += strlen( unix_name + pos ); - name = next; - - if (is_win_dir && (prefix_len = get_redirect_path( unix_name, pos, name, name_len, check_case ))) - { - name += prefix_len; - name_len -= prefix_len; - pos += strlen( unix_name + pos ); - TRACE( "redirecting %s -> %s + %s\n", - debugstr_us(nameW), debugstr_a(unix_name), debugstr_w(name) ); - } } - -done: - TRACE( "%s -> %s\n", debugstr_us(nameW), debugstr_a(unix_name) ); - unix_name_ret->Buffer = unix_name; - unix_name_ret->Length = strlen(unix_name); - unix_name_ret->MaximumLength = unix_len; return status; }

1 0

Alexandre Julliard : ntdll: Add support for converting file names to Unix when a root directory is specified .
by Alexandre Julliard 02 Dec '09

02 Dec '09

Module: wine Branch: master Commit: d97149b708ae2df3e0428340103e910513b77103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d97149b708ae2df3e04283401… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 17:07:55 2009 +0100 ntdll: Add support for converting file names to Unix when a root directory is specified. --- dlls/ntdll/directory.c | 89 +++++++++++++++++++++++++++++++++++++++++++--- dlls/ntdll/file.c | 12 ++---- dlls/ntdll/ntdll_misc.h | 2 + 3 files changed, 89 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 7833809..8af2d00 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2236,17 +2236,20 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer name_len--; } - if (ret > 0 && !used_default) /* if we used the default char the name didn't convert properly */ + if (ret >= 0 && !used_default) /* if we used the default char the name didn't convert properly */ { char *p; unix_name[pos + ret] = 0; for (p = unix_name + pos ; *p; p++) if (*p == '\\') *p = '/'; - if ((!redirect || !strstr( unix_name, "/windows/")) && !stat( unix_name, &st )) + if (!redirect || (!strstr( unix_name, "/windows/") && strncmp( unix_name, "windows/", 8 ))) { - /* creation fails with STATUS_ACCESS_DENIED for the root of the drive */ - if (disposition == FILE_CREATE) - return name_len ? STATUS_OBJECT_NAME_COLLISION : STATUS_ACCESS_DENIED; - return STATUS_SUCCESS; + if (!stat( unix_name, &st )) + { + /* creation fails with STATUS_ACCESS_DENIED for the root of the drive */ + if (disposition == FILE_CREATE) + return name_len ? STATUS_OBJECT_NAME_COLLISION : STATUS_ACCESS_DENIED; + return STATUS_SUCCESS; + } } } @@ -2326,6 +2329,80 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer /****************************************************************************** + * nt_to_unix_file_name_attr + */ +NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_STRING *unix_name_ret, + UINT disposition ) +{ + static const WCHAR invalid_charsW[] = { INVALID_NT_CHARS, 0 }; + enum server_fd_type type; + int old_cwd, root_fd, needs_close; + const WCHAR *name, *p; + char *unix_name; + int name_len, unix_len; + NTSTATUS status; + BOOLEAN check_case = !(attr->Attributes & OBJ_CASE_INSENSITIVE); + + if (!attr->RootDirectory) /* without root dir fall back to normal lookup */ + return wine_nt_to_unix_file_name( attr->ObjectName, unix_name_ret, disposition, check_case ); + + name = attr->ObjectName->Buffer; + name_len = attr->ObjectName->Length / sizeof(WCHAR); + + if (name_len && IS_SEPARATOR(name[0])) return STATUS_OBJECT_PATH_SYNTAX_BAD; + + /* check for invalid characters */ + for (p = name; p < name + name_len; p++) + if (*p < 32 || strchrW( invalid_charsW, *p )) return STATUS_OBJECT_NAME_INVALID; + + unix_len = ntdll_wcstoumbs( 0, name, name_len, NULL, 0, NULL, NULL ); + unix_len += MAX_DIR_ENTRY_LEN + 3; + if (!(unix_name = RtlAllocateHeap( GetProcessHeap(), 0, unix_len ))) + return STATUS_NO_MEMORY; + unix_name[0] = '.'; + + if (!(status = server_get_unix_fd( attr->RootDirectory, FILE_READ_DATA, &root_fd, + &needs_close, &type, NULL ))) + { + if (type != FD_TYPE_DIR) + { + if (needs_close) close( root_fd ); + status = STATUS_BAD_DEVICE_TYPE; + } + else + { + RtlEnterCriticalSection( &dir_section ); + if ((old_cwd = open( ".", O_RDONLY )) != -1 && fchdir( root_fd ) != -1) + { + status = lookup_unix_name( name, name_len, &unix_name, unix_len, 1, + disposition, check_case ); + if (fchdir( old_cwd ) == -1) chdir( "/" ); + } + else status = FILE_GetNtStatus(); + RtlLeaveCriticalSection( &dir_section ); + if (old_cwd != -1) close( old_cwd ); + if (needs_close) close( root_fd ); + } + } + else if (status == STATUS_OBJECT_TYPE_MISMATCH) status = STATUS_BAD_DEVICE_TYPE; + + if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE) + { + TRACE( "%s -> %s\n", debugstr_us(attr->ObjectName), debugstr_a(unix_name) ); + unix_name_ret->Buffer = unix_name; + unix_name_ret->Length = strlen(unix_name); + unix_name_ret->MaximumLength = unix_len; + } + else + { + TRACE( "%s not found in %s\n", debugstr_w(name), unix_name ); + RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + } + return status; +} + + +/****************************************************************************** * wine_nt_to_unix_file_name (NTDLL.@) Not a Windows API * * Convert a file name from NT namespace to Unix namespace. diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index a43291e..213d083 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -115,9 +115,7 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT if (alloc_size) FIXME( "alloc_size not supported\n" ); - if (attr->RootDirectory || - (io->u.Status = wine_nt_to_unix_file_name( attr->ObjectName, &unix_name, disposition, - !(attr->Attributes & OBJ_CASE_INSENSITIVE) )) == STATUS_BAD_DEVICE_TYPE) + if ((io->u.Status = nt_to_unix_file_name_attr( attr, &unix_name, disposition )) == STATUS_BAD_DEVICE_TYPE) { SERVER_START_REQ( open_file_object ) { @@ -147,7 +145,7 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT struct security_descriptor *sd = NULL; struct object_attributes objattr; - objattr.rootdir = 0; + objattr.rootdir = wine_server_obj_handle( attr->RootDirectory ); objattr.sd_len = 0; objattr.name_len = 0; if (attr) @@ -2117,8 +2115,7 @@ NTSTATUS WINAPI NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr, ANSI_STRING unix_name; NTSTATUS status; - if (!(status = wine_nt_to_unix_file_name( attr->ObjectName, &unix_name, FILE_OPEN, - !(attr->Attributes & OBJ_CASE_INSENSITIVE) ))) + if (!(status = nt_to_unix_file_name_attr( attr, &unix_name, FILE_OPEN ))) { struct stat st; @@ -2160,8 +2157,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC ANSI_STRING unix_name; NTSTATUS status; - if (!(status = wine_nt_to_unix_file_name( attr->ObjectName, &unix_name, FILE_OPEN, - !(attr->Attributes & OBJ_CASE_INSENSITIVE) ))) + if (!(status = nt_to_unix_file_name_attr( attr, &unix_name, FILE_OPEN ))) { struct stat st; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1150f47..b1e976c 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -147,6 +147,8 @@ extern BOOL DIR_is_hidden_file( const UNICODE_STRING *name ); extern NTSTATUS DIR_unmount_device( HANDLE handle ); extern NTSTATUS DIR_get_unix_cwd( char **cwd ); extern unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES] ); +extern NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_STRING *unix_name_ret, + UINT disposition ); /* virtual memory */ extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info );

1 0

Alexandre Julliard : server: Add support for opening files from a specified root directory.
by Alexandre Julliard 02 Dec '09

02 Dec '09

Module: wine Branch: master Commit: 42806f32e933cf1e6f6513ca95a0ec7cbb7c2bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42806f32e933cf1e6f6513ca9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 17:38:24 2009 +0100 server: Add support for opening files from a specified root directory. --- server/change.c | 3 +-- server/fd.c | 37 ++++++++++++++++++++++++++++++++++--- server/file.c | 31 ++++++++++++++++++++++++------- server/file.h | 5 +++-- 4 files changed, 62 insertions(+), 14 deletions(-) diff --git a/server/change.c b/server/change.c index 06d9e37..7ef456f 100644 --- a/server/change.c +++ b/server/change.c @@ -419,8 +419,7 @@ static void dir_destroy( struct object *obj ) } } -static struct dir * -get_dir_obj( struct process *process, obj_handle_t handle, unsigned int access ) +struct dir *get_dir_obj( struct process *process, obj_handle_t handle, unsigned int access ) { return (struct dir *)get_handle_obj( process, handle, access, &dir_ops ); } diff --git a/server/fd.c b/server/fd.c index 9d8a06f..8f35812 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1702,14 +1702,34 @@ void set_fd_user( struct fd *fd, const struct fd_ops *user_ops, struct object *u fd->user = user; } +static char *dup_fd_name( struct fd *root, const char *name ) +{ + char *ret; + + if (!root) return strdup( name ); + if (!root->unix_name) return NULL; + + /* skip . prefix */ + if (name[0] == '.' && (!name[1] || name[1] == '/')) name++; + + if ((ret = malloc( strlen(root->unix_name) + strlen(name) + 2 ))) + { + strcpy( ret, root->unix_name ); + if (name[0] && name[0] != '/') strcat( ret, "/" ); + strcat( ret, name ); + } + return ret; +} + /* open() wrapper that returns a struct fd with no fd user set */ -struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned int access, +struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, unsigned int access, unsigned int sharing, unsigned int options ) { struct stat st; struct closed_fd *closed_fd; struct fd *fd; const char *unlink_name = ""; + int root_fd = -1; int rw_mode; if ((options & FILE_DELETE_ON_CLOSE) && !(access & DELETE)) @@ -1728,6 +1748,17 @@ struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned int acce return NULL; } + if (root) + { + if ((root_fd = get_unix_fd( root )) == -1) goto error; + if (fchdir( root_fd ) == -1) + { + file_set_error(); + root_fd = -1; + goto error; + } + } + /* create the directory if needed */ if ((options & FILE_DIRECTORY_FILE) && (flags & O_CREAT)) { @@ -1749,8 +1780,7 @@ struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned int acce } else rw_mode = O_RDONLY; - if (!(fd->unix_name = mem_alloc( strlen(name) + 1 ))) goto error; - strcpy( fd->unix_name, name ); + fd->unix_name = dup_fd_name( root, name ); if ((fd->unix_fd = open( name, rw_mode | (flags & ~O_TRUNC), *mode )) == -1) { @@ -1827,6 +1857,7 @@ struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned int acce error: release_object( fd ); free( closed_fd ); + if (root_fd != -1) fchdir( server_dir_fd ); /* go back to the server dir */ return NULL; } diff --git a/server/file.c b/server/file.c index c09ddc5..3e09ddd 100644 --- a/server/file.c +++ b/server/file.c @@ -154,9 +154,10 @@ static struct object *create_file_obj( struct fd *fd, unsigned int access, mode_ return &file->obj; } -static struct object *create_file( const char *nameptr, data_size_t len, unsigned int access, - unsigned int sharing, int create, unsigned int options, - unsigned int attrs, const struct security_descriptor *sd ) +static struct object *create_file( struct fd *root, const char *nameptr, data_size_t len, + unsigned int access, unsigned int sharing, int create, + unsigned int options, unsigned int attrs, + const struct security_descriptor *sd ) { struct object *obj = NULL; struct fd *fd; @@ -164,6 +165,11 @@ static struct object *create_file( const char *nameptr, data_size_t len, unsigne char *name; mode_t mode; + if (!len || ((nameptr[0] == '/') ^ !root)) + { + set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); + return NULL; + } if (!(name = mem_alloc( len + 1 ))) return NULL; memcpy( name, nameptr, len ); name[len] = 0; @@ -203,7 +209,7 @@ static struct object *create_file( const char *nameptr, data_size_t len, unsigne access = generic_file_map_access( access ); /* FIXME: should set error to STATUS_OBJECT_NAME_COLLISION if file existed before */ - fd = open_fd( name, flags | O_NONBLOCK | O_LARGEFILE, &mode, access, sharing, options ); + fd = open_fd( root, name, flags | O_NONBLOCK | O_LARGEFILE, &mode, access, sharing, options ); if (!fd) goto done; if (S_ISDIR(mode)) @@ -628,6 +634,7 @@ struct file *grab_file_unless_removable( struct file *file ) DECL_HANDLER(create_file) { struct object *file; + struct fd *root_fd = NULL; const struct object_attributes *objattr = get_req_data(); const struct security_descriptor *sd; const char *name; @@ -644,19 +651,29 @@ DECL_HANDLER(create_file) return; } + if (objattr->rootdir) + { + struct dir *root; + + if (!(root = get_dir_obj( current->process, objattr->rootdir, 0 ))) return; + root_fd = get_obj_fd( (struct object *)root ); + release_object( root ); + if (!root_fd) return; + } + sd = objattr->sd_len ? (const struct security_descriptor *)(objattr + 1) : NULL; name = (const char *)get_req_data() + sizeof(*objattr) + objattr->sd_len; name_len = get_req_data_size() - sizeof(*objattr) - objattr->sd_len; reply->handle = 0; - if ((file = create_file( name, name_len, req->access, - req->sharing, req->create, req->options, - req->attrs, sd ))) + if ((file = create_file( root_fd, name, name_len, req->access, req->sharing, + req->create, req->options, req->attrs, sd ))) { reply->handle = alloc_handle( current->process, file, req->access, req->attributes ); release_object( file ); } + if (root_fd) release_object( root_fd ); } /* allocate a file handle for a Unix fd */ diff --git a/server/file.h b/server/file.h index a49fc4d..03cea89 100644 --- a/server/file.h +++ b/server/file.h @@ -54,8 +54,8 @@ struct fd_ops extern struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user, unsigned int options ); extern void set_no_fd_status( struct fd *fd, unsigned int status ); -extern struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned int access, - unsigned int sharing, unsigned int options ); +extern struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, + unsigned int access, 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, unsigned int access, unsigned int sharing, @@ -125,6 +125,7 @@ extern mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner extern void do_change_notify( int unix_fd ); extern void sigio_callback(void); extern struct object *create_dir_obj( struct fd *fd, unsigned int access, mode_t mode ); +extern struct dir *get_dir_obj( struct process *process, obj_handle_t handle, unsigned int access ); /* completion */

1 0

Alexandre Julliard : ntdll/tests: Add tests for opening files with a root directory handle.
by Alexandre Julliard 02 Dec '09

02 Dec '09

Module: wine Branch: master Commit: 84b309f3099f65af59edcf1c4f736094951ffce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84b309f3099f65af59edcf1c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 17:38:39 2009 +0100 ntdll/tests: Add tests for opening files with a root directory handle. --- dlls/ntdll/tests/file.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 129444a..ccec589 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -50,6 +50,7 @@ static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirectionEx)( ULONG, ULONG * ); static NTSTATUS (WINAPI *pNtCreateMailslotFile)( PHANDLE, ULONG, POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK, ULONG, ULONG, ULONG, PLARGE_INTEGER ); +static NTSTATUS (WINAPI *pNtOpenFile)(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG); static NTSTATUS (WINAPI *pNtDeleteFile)(POBJECT_ATTRIBUTES ObjectAttributes); static NTSTATUS (WINAPI *pNtReadFile)(HANDLE hFile, HANDLE hEvent, PIO_APC_ROUTINE apc, void* apc_user, @@ -149,6 +150,65 @@ static void WINAPI apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) ok( !reserved, "reserved is not 0: %x\n", reserved ); } +static void open_file_test(void) +{ + NTSTATUS status; + HANDLE dir, handle; + WCHAR path[MAX_PATH]; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + UNICODE_STRING nameW; + UINT i, len; + + len = GetWindowsDirectoryW( path, MAX_PATH ); + pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + status = pNtOpenFile( &dir, GENERIC_READ, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + /* test opening system dir with RootDirectory set to windows dir */ + GetSystemDirectoryW( path, MAX_PATH ); + while (path[len] == '\\') len++; + nameW.Buffer = path + len; + nameW.Length = lstrlenW(path + len) * sizeof(WCHAR); + attr.RootDirectory = dir; + status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + CloseHandle( handle ); + + /* try uppercase name */ + for (i = len; path[i]; i++) if (path[i] >= 'a' && path[i] <= 'z') path[i] -= 'a' - 'A'; + status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + CloseHandle( handle ); + + /* try with leading backslash */ + nameW.Buffer--; + nameW.Length += sizeof(WCHAR); + status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); + ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + if (!status) CloseHandle( handle ); + + /* try with empty name */ + nameW.Length = 0; + status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + CloseHandle( handle ); + + CloseHandle( dir ); +} + static void delete_file_test(void) { NTSTATUS ret; @@ -1233,6 +1293,7 @@ START_TEST(file) pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); pRtlWow64EnableFsRedirectionEx = (void *)GetProcAddress(hntdll, "RtlWow64EnableFsRedirectionEx"); pNtCreateMailslotFile = (void *)GetProcAddress(hntdll, "NtCreateMailslotFile"); + pNtOpenFile = (void *)GetProcAddress(hntdll, "NtOpenFile"); pNtDeleteFile = (void *)GetProcAddress(hntdll, "NtDeleteFile"); pNtReadFile = (void *)GetProcAddress(hntdll, "NtReadFile"); pNtWriteFile = (void *)GetProcAddress(hntdll, "NtWriteFile"); @@ -1247,6 +1308,7 @@ START_TEST(file) pNtSetInformationFile = (void *)GetProcAddress(hntdll, "NtSetInformationFile"); pNtQueryInformationFile = (void *)GetProcAddress(hntdll, "NtQueryInformationFile"); + open_file_test(); delete_file_test(); read_file_test(); nt_mailslot_test();

1 0

Hans Leidekker : wininet: Also cache files transferred over ftp.
by Alexandre Julliard 02 Dec '09

02 Dec '09

Module: wine Branch: master Commit: 6f6ee2e712b3cd3c2d74582fd73deafc942653a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f6ee2e712b3cd3c2d74582fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 1 17:00:39 2009 +0100 wininet: Also cache files transferred over ftp. --- dlls/wininet/ftp.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 63 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 338f743..ea5b355 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -76,6 +76,8 @@ typedef struct ftp_session_t *lpFtpSession; BOOL session_deleted; int nDataSocket; + WCHAR *cache_file; + HANDLE cache_file_handle; } ftp_file_t; struct _ftp_session_t @@ -88,6 +90,8 @@ struct _ftp_session_t ftp_file_t *download_in_progress; struct sockaddr_in socketAddress; struct sockaddr_in lstnSocketAddress; + LPWSTR servername; + INTERNET_PORT serverport; LPWSTR lpszPassword; LPWSTR lpszUserName; }; @@ -1098,6 +1102,11 @@ static void FTPFILE_Destroy(object_header_t *hdr) TRACE("\n"); + if (lpwh->cache_file_handle != INVALID_HANDLE_VALUE) + CloseHandle(lpwh->cache_file_handle); + + HeapFree(GetProcessHeap(), 0, lpwh->cache_file); + if (!lpwh->session_deleted) lpwfs->download_in_progress = NULL; @@ -1133,6 +1142,7 @@ static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW { ftp_file_t *file = (ftp_file_t*)hdr; int res; + DWORD error; if (file->nDataSocket == -1) return ERROR_INTERNET_DISCONNECTED; @@ -1141,7 +1151,15 @@ static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW res = recv(file->nDataSocket, buffer, size, MSG_WAITALL); *read = res>0 ? res : 0; - return res>=0 ? ERROR_SUCCESS : INTERNET_ERROR_BASE; /* FIXME*/ + error = res >= 0 ? ERROR_SUCCESS : INTERNET_ERROR_BASE; /* FIXME */ + if (error == ERROR_SUCCESS && file->cache_file) + { + DWORD bytes_written; + + if (!WriteFile(file->cache_file_handle, buffer, *read, &bytes_written, NULL)) + WARN("WriteFile failed: %u\n", GetLastError()); + } + return error; } static DWORD FTPFILE_ReadFileExA(object_header_t *hdr, INTERNET_BUFFERSA *buffers, @@ -1297,7 +1315,9 @@ HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs, lpwh->hdr.refs = 1; lpwh->hdr.lpfnStatusCB = lpwfs->hdr.lpfnStatusCB; lpwh->nDataSocket = nDataSocket; - lpwh->session_deleted = FALSE; + lpwh->cache_file = NULL; + lpwh->cache_file_handle = INVALID_HANDLE_VALUE; + lpwh->session_deleted = FALSE; WININET_AddRef( &lpwfs->hdr ); lpwh->lpFtpSession = lpwfs; @@ -1317,6 +1337,41 @@ HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs, lpwfs->lstnSocket = -1; } + if (bSuccess && fdwAccess == GENERIC_READ) + { + WCHAR filename[MAX_PATH + 1]; + URL_COMPONENTSW uc; + DWORD len; + + memset(&uc, 0, sizeof(uc)); + uc.dwStructSize = sizeof(uc); + uc.nScheme = INTERNET_SCHEME_FTP; + uc.lpszHostName = lpwfs->servername; + uc.nPort = lpwfs->serverport; + uc.lpszUserName = lpwfs->lpszUserName; + uc.lpszUrlPath = heap_strdupW(lpszFileName); + + if (!InternetCreateUrlW(&uc, 0, NULL, &len) && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + WCHAR *url = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + + if (url && InternetCreateUrlW(&uc, 0, url, &len) && CreateUrlCacheEntryW(url, 0, NULL, filename, 0)) + { + lpwh->cache_file = heap_strdupW(filename); + lpwh->cache_file_handle = CreateFileW(filename, GENERIC_WRITE, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (lpwh->cache_file_handle == INVALID_HANDLE_VALUE) + { + WARN("Could not create cache file: %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, lpwh->cache_file); + lpwh->cache_file = NULL; + } + HeapFree(GetProcessHeap(), 0, url); + } + } + HeapFree(GetProcessHeap(), 0, uc.lpszUrlPath); + } + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { @@ -2256,6 +2311,7 @@ static void FTPSESSION_Destroy(object_header_t *hdr) HeapFree(GetProcessHeap(), 0, lpwfs->lpszPassword); HeapFree(GetProcessHeap(), 0, lpwfs->lpszUserName); + HeapFree(GetProcessHeap(), 0, lpwfs->servername); HeapFree(GetProcessHeap(), 0, lpwfs); } @@ -2374,7 +2430,9 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, } if (nServerPort == INTERNET_INVALID_PORT_NUMBER) - nServerPort = INTERNET_DEFAULT_FTP_PORT; + lpwfs->serverport = INTERNET_DEFAULT_FTP_PORT; + else + lpwfs->serverport = nServerPort; lpwfs->hdr.htype = WH_HFTPSESSION; lpwfs->hdr.vtbl = &FTPSESSIONVtbl; @@ -2430,6 +2488,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, lpwfs->lpszUserName = heap_strdupW(lpszUserName); lpwfs->lpszPassword = heap_strdupW(lpszPassword ? lpszPassword : szEmpty); } + lpwfs->servername = heap_strdupW(lpszServerName); /* Don't send a handle created callback if this handle was created with InternetOpenUrl */ if (!(lpwfs->hdr.dwInternalFlags & INET_OPENURL)) @@ -2448,8 +2507,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, (LPWSTR) lpszServerName, strlenW(lpszServerName)); sock_namelen = sizeof(socketAddr); - if (!GetAddress(lpszServerName, nServerPort, - (struct sockaddr *)&socketAddr, &sock_namelen)) + if (!GetAddress(lpszServerName, lpwfs->serverport, (struct sockaddr *)&socketAddr, &sock_namelen)) { INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); goto lerror;

1 0

Jörg Höhle : mciavi: Simplify play loop.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: f47ea4681f0cb2b0b5957d3432f732d7b35a9ebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f47ea4681f0cb2b0b5957d343… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Nov 22 15:38:26 2009 +0100 mciavi: Simplify play loop. --- dlls/mciavi32/mciavi.c | 35 ++++++++++++++--------------------- 1 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index d268ee7..8613bff 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -387,13 +387,13 @@ static DWORD MCIAVI_mciPlay_async(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PA static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) { WINE_MCIAVI *wma; - DWORD tc; DWORD frameTime; - DWORD delta; DWORD dwRet; LPWAVEHDR waveHdr = NULL; unsigned i, nHdr = 0; DWORD dwFromFrame, dwToFrame; + DWORD numEvents = 1; + HANDLE events[2]; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -467,6 +467,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms /* time is in microseconds, we should convert it to milliseconds */ frameTime = (wma->mah.dwMicroSecPerFrame + 500) / 1000; + events[0] = wma->hStopEvent; if (wma->lpWaveFormat) { if (MCIAVI_OpenAudio(wma, &nHdr, &waveHdr) != 0) { @@ -474,14 +475,19 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms HeapFree(GetProcessHeap(), 0, wma->lpWaveFormat); wma->lpWaveFormat = NULL; } - else - /* fill the queue with as many wave headers as possible */ - MCIAVI_PlayAudioBlocks(wma, nHdr, waveHdr); + else + { + /* fill the queue with as many wave headers as possible */ + MCIAVI_PlayAudioBlocks(wma, nHdr, waveHdr); + events[1] = wma->hEvent; + numEvents = 2; + } } while (wma->dwStatus == MCI_MODE_PLAY) { HDC hDC; + DWORD tc, delta; DWORD ret; tc = GetTickCount(); @@ -493,21 +499,8 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms ReleaseDC(wma->hWndPaint, hDC); } - if (wma->lpWaveFormat) { - HANDLE events[2]; - - events[0] = wma->hStopEvent; - events[1] = wma->hEvent; - + if (wma->lpWaveFormat) MCIAVI_PlayAudioBlocks(wma, nHdr, waveHdr); - delta = GetTickCount() - tc; - - LeaveCriticalSection(&wma->cs); - ret = WaitForMultipleObjects(2, events, FALSE, (delta >= frameTime) ? 0 : frameTime - delta); - EnterCriticalSection(&wma->cs); - - if (ret == WAIT_OBJECT_0 || wma->dwStatus != MCI_MODE_PLAY) break; - } delta = GetTickCount() - tc; if (delta < frameTime) @@ -516,9 +509,9 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms delta = 0; LeaveCriticalSection(&wma->cs); - ret = WaitForMultipleObjects(1, &wma->hStopEvent, FALSE, delta); + ret = WaitForMultipleObjects(numEvents, events, FALSE, delta); EnterCriticalSection(&wma->cs); - if (ret == WAIT_OBJECT_0) break; + if (ret == WAIT_OBJECT_0 || wma->dwStatus != MCI_MODE_PLAY) break; if (wma->dwCurrVideoFrame < dwToFrame) wma->dwCurrVideoFrame++;

1 0

Owen Rudge : imagehlp/tests: Add tests of Image[Add|Get|Remove] Certificate functions.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 8c8b0ebbda3ad343e5afcb6dad28eae1e0b2501f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c8b0ebbda3ad343e5afcb6da… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 30 21:14:30 2009 +0000 imagehlp/tests: Add tests of Image[Add|Get|Remove]Certificate functions. --- configure | 9 ++ configure.ac | 1 + dlls/imagehlp/tests/Makefile.in | 13 ++ dlls/imagehlp/tests/integrity.c | 239 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 262 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c8b0ebbda3ad343e5afc…

1 0

Jacek Caban : jscript: Pass NULL as retv to exec_source in exec_global_code .
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 77d58529f57adf85fbaca22036f74be3d57de655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77d58529f57adf85fbaca2203… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 1 14:52:43 2009 +0100 jscript: Pass NULL as retv to exec_source in exec_global_code. --- dlls/jscript/jscript.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 602ffae..9a516aa 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -94,7 +94,6 @@ static HRESULT exec_global_code(JScript *This, parser_ctx_t *parser_ctx) { exec_ctx_t *exec_ctx; jsexcept_t jsexcept; - VARIANT var; HRESULT hres; hres = create_exec_ctx(This->ctx, NULL, This->ctx->global, NULL, &exec_ctx); @@ -104,14 +103,11 @@ static HRESULT exec_global_code(JScript *This, parser_ctx_t *parser_ctx) IActiveScriptSite_OnEnterScript(This->site); memset(&jsexcept, 0, sizeof(jsexcept)); - hres = exec_source(exec_ctx, parser_ctx, parser_ctx->source, EXECT_PROGRAM, &jsexcept, &var); + hres = exec_source(exec_ctx, parser_ctx, parser_ctx->source, EXECT_PROGRAM, &jsexcept, NULL); VariantClear(&jsexcept.var); exec_release(exec_ctx); - if(SUCCEEDED(hres)) - VariantClear(&var); IActiveScriptSite_OnLeaveScript(This->site); - return hres; }

1 0

Alexandre Julliard : server: Make sure that last error doesn' t get set during thread cleanup.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: e4faa12900a8bc2be59cbb611b3cdf456942cbf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4faa12900a8bc2be59cbb611… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 15:10:23 2009 +0100 server: Make sure that last error doesn't get set during thread cleanup. --- server/clipboard.c | 6 ++++-- server/hook.c | 5 +++-- server/process.c | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/server/clipboard.c b/server/clipboard.c index 065dd2d..0c39319 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -30,6 +30,7 @@ #define WIN32_NO_STATUS #include "request.h" #include "object.h" +#include "process.h" #include "user.h" #include "winuser.h" #include "winternl.h" @@ -112,9 +113,10 @@ static struct clipboard *get_process_clipboard(void) void cleanup_clipboard_thread(struct thread *thread) { struct clipboard *clipboard; - struct winstation *winstation = get_process_winstation( thread->process, WINSTA_ACCESSCLIPBOARD ); + struct winstation *winstation; - if (!winstation) return; + if (!thread->process->winstation) return; + if (!(winstation = get_process_winstation( thread->process, WINSTA_ACCESSCLIPBOARD ))) return; if ((clipboard = winstation->clipboard)) { diff --git a/server/hook.c b/server/hook.c index f5ebc2b..7b889d8 100644 --- a/server/hook.c +++ b/server/hook.c @@ -114,9 +114,10 @@ static struct hook_table *alloc_hook_table(void) static struct hook_table *get_global_hooks( struct thread *thread ) { struct hook_table *table; - struct desktop *desktop = get_thread_desktop( thread, 0 ); + struct desktop *desktop; - if (!desktop) return NULL; + if (!thread->desktop) return NULL; + if (!(desktop = get_thread_desktop( thread, 0 ))) return NULL; table = desktop->global_hooks; release_object( desktop ); return table; diff --git a/server/process.c b/server/process.c index 630abe6..51193b7 100644 --- a/server/process.c +++ b/server/process.c @@ -632,6 +632,8 @@ static void process_killed( struct process *process ) handles = process->handles; process->handles = NULL; if (handles) release_object( handles ); + process->winstation = 0; + process->desktop = 0; /* close the console attached to this process, if any */ free_console( process );

1 0

Ilya Shpigor : comctl32: Test the WM_GETTEXT processing of datetime control .
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: e4e55ed8b4e2ff57a62927fb91f4d4244a0a3b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e55ed8b4e2ff57a62927fb9… Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Mon Nov 30 15:24:27 2009 +0300 comctl32: Test the WM_GETTEXT processing of datetime control. --- dlls/comctl32/tests/datetime.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 8a3ad03..9218e07 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -659,7 +659,7 @@ static void test_dtm_set_and_get_system_time(void) static void test_wm_set_get_text(void) { static const CHAR a_str[] = "a"; - char buff[10]; + char buff[16], time[16]; HWND hWnd; LRESULT ret; @@ -674,6 +674,10 @@ static void test_wm_set_get_text(void) ret = SendMessage(hWnd, WM_GETTEXT, sizeof(buff), (LPARAM)buff); ok(strcmp(buff, a_str) != 0, "Expected text not to change, got %s\n", buff); + GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, time, sizeof(time)); + todo_wine + ok(!strcmp(buff, time), "Expected %s, got %s\n", time, buff); + DestroyWindow(hWnd); }

1 0