November 2009 - Wine-Commits

Alexandre Julliard : ntdll: Define a generic file information structure to allow supporting multiple info classes in NtQueryDirectoryFile .
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: cfafcc5a6ef8ccf73e07a92ea0fe7fb041f652d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfafcc5a6ef8ccf73e07a92ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 17:42:51 2009 +0100 ntdll: Define a generic file information structure to allow supporting multiple info classes in NtQueryDirectoryFile. --- dlls/ntdll/directory.c | 55 +++++++++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index f7736e2..85170aa 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -148,6 +148,12 @@ struct file_identity static struct file_identity ignored_files[MAX_IGNORED_FILES]; static int ignored_files_count; +union file_directory_info +{ + ULONG next; + FILE_BOTH_DIRECTORY_INFORMATION both; +}; + static const unsigned int max_dir_info_size = FIELD_OFFSET( FILE_BOTH_DIR_INFORMATION, FileName[MAX_DIR_ENTRY_LEN] ); static int show_dot_files = -1; @@ -923,11 +929,11 @@ static BOOLEAN match_filename( const UNICODE_STRING *name_str, const UNICODE_STR * * helper for NtQueryDirectoryFile */ -static FILE_BOTH_DIR_INFORMATION *append_entry( void *info_ptr, IO_STATUS_BLOCK *io, ULONG max_length, +static union file_directory_info *append_entry( void *info_ptr, IO_STATUS_BLOCK *io, ULONG max_length, const char *long_name, const char *short_name, const UNICODE_STRING *mask ) { - FILE_BOTH_DIR_INFORMATION *info; + union file_directory_info *info; int i, long_len, short_len, total_len; struct stat st; WCHAR long_nameW[MAX_DIR_ENTRY_LEN]; @@ -984,24 +990,25 @@ static FILE_BOTH_DIR_INFORMATION *append_entry( void *info_ptr, IO_STATUS_BLOCK if (!show_dot_files && long_name[0] == '.' && long_name[1] && (long_name[1] != '.' || long_name[2])) attributes |= FILE_ATTRIBUTE_HIDDEN; - total_len = (sizeof(*info) - sizeof(info->FileName) + long_len*sizeof(WCHAR) + 3) & ~3; + total_len = (FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName[long_len]) + 3) & ~3; if (io->Information + total_len > max_length) { total_len = max_length - io->Information; io->u.Status = STATUS_BUFFER_OVERFLOW; } - info = (FILE_BOTH_DIR_INFORMATION *)((char *)info_ptr + io->Information); - fill_stat_info( &st, info, FileBothDirectoryInformation ); - info->NextEntryOffset = total_len; - info->FileIndex = 0; /* NTFS always has 0 here, so let's not bother with it */ - info->FileAttributes |= attributes; - info->EaSize = 0; /* FIXME */ - info->ShortNameLength = short_len * sizeof(WCHAR); - for (i = 0; i < short_len; i++) info->ShortName[i] = toupperW(short_nameW[i]); - info->FileNameLength = long_len * sizeof(WCHAR); - memcpy( info->FileName, long_nameW, - min( info->FileNameLength, total_len-sizeof(*info)+sizeof(info->FileName) )); + info = (union file_directory_info *)((char *)info_ptr + io->Information); + fill_stat_info( &st, &info->both, FileBothDirectoryInformation ); + info->both.NextEntryOffset = total_len; + info->both.FileIndex = 0; /* NTFS always has 0 here, so let's not bother with it */ + info->both.FileAttributes |= attributes; + info->both.EaSize = 0; /* FIXME */ + info->both.ShortNameLength = short_len * sizeof(WCHAR); + for (i = 0; i < short_len; i++) info->both.ShortName[i] = toupperW(short_nameW[i]); + info->both.FileNameLength = long_len * sizeof(WCHAR); + memcpy( info->both.FileName, long_nameW, + min( info->both.FileNameLength, + total_len - FIELD_OFFSET( FILE_BOTH_DIR_INFORMATION, FileName ))); io->Information += total_len; return info; @@ -1063,7 +1070,7 @@ static int read_directory_vfat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG { size_t len; KERNEL_DIRENT *de; - FILE_BOTH_DIR_INFORMATION *info, *last_info = NULL; + union file_directory_info *info, *last_info = NULL; io->u.Status = STATUS_SUCCESS; @@ -1125,7 +1132,7 @@ static int read_directory_vfat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG } } - if (last_info) last_info->NextEntryOffset = 0; + if (last_info) last_info->next = 0; else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; return 0; } @@ -1147,7 +1154,7 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U int res, fake_dot_dot = 1; char *data, local_buffer[8192]; KERNEL_DIRENT64 *de; - FILE_BOTH_DIR_INFORMATION *info, *last_info = NULL; + union file_directory_info *info, *last_info = NULL; if (size <= sizeof(local_buffer) || !(data = RtlAllocateHeap( GetProcessHeap(), 0, size ))) { @@ -1251,7 +1258,7 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U } } - if (last_info) last_info->NextEntryOffset = 0; + if (last_info) last_info->next = 0; else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; res = 0; done: @@ -1320,7 +1327,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff int res, fake_dot_dot = 1; char *data, local_buffer[8192]; struct dirent *de; - FILE_BOTH_DIR_INFORMATION *info, *last_info = NULL, *restart_last_info = NULL; + union file_directory_info *info, *last_info = NULL, *restart_last_info = NULL; size = initial_size; data = local_buffer; @@ -1439,7 +1446,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff de = (struct dirent *)data; } - if (last_info) last_info->NextEntryOffset = 0; + if (last_info) last_info->next = 0; else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; res = 0; done: @@ -1467,7 +1474,7 @@ static void read_directory_readdir( int fd, IO_STATUS_BLOCK *io, void *buffer, U DIR *dir; off_t i, old_pos = 0; struct dirent *de; - FILE_BOTH_DIR_INFORMATION *info, *last_info = NULL; + union file_directory_info *info, *last_info = NULL; if (!(dir = opendir( "." ))) { @@ -1524,7 +1531,7 @@ static void read_directory_readdir( int fd, IO_STATUS_BLOCK *io, void *buffer, U lseek( fd, old_pos, SEEK_SET ); /* store dir offset as filepos for fd */ closedir( dir ); - if (last_info) last_info->NextEntryOffset = 0; + if (last_info) last_info->next = 0; else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } @@ -1569,10 +1576,10 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG ret = stat( unix_name, &st ); if (!ret) { - FILE_BOTH_DIR_INFORMATION *info = append_entry( buffer, io, length, unix_name, NULL, NULL ); + union file_directory_info *info = append_entry( buffer, io, length, unix_name, NULL, NULL ); if (info) { - info->NextEntryOffset = 0; + info->next = 0; if (io->u.Status != STATUS_BUFFER_OVERFLOW) lseek( fd, 1, SEEK_CUR ); } else io->u.Status = STATUS_NO_MORE_FILES;

1 0

Alexandre Julliard : ntdll: Add support for the different info classes in NtQueryDirectoryFile.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 74ae7d358f786740e44ff184d432a42b57291a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ae7d358f786740e44ff184d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 18:07:30 2009 +0100 ntdll: Add support for the different info classes in NtQueryDirectoryFile. --- dlls/ntdll/directory.c | 59 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 51 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 602b08c..a09aab1 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -151,7 +151,11 @@ static int ignored_files_count; union file_directory_info { ULONG next; + FILE_DIRECTORY_INFORMATION dir; FILE_BOTH_DIRECTORY_INFORMATION both; + FILE_FULL_DIRECTORY_INFORMATION full; + FILE_ID_BOTH_DIRECTORY_INFORMATION id_both; + FILE_ID_FULL_DIRECTORY_INFORMATION id_full; }; static int show_dot_files = -1; @@ -223,8 +227,16 @@ static inline unsigned int dir_info_size( FILE_INFORMATION_CLASS class, unsigned { switch (class) { + case FileDirectoryInformation: + return (FIELD_OFFSET( FILE_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; case FileBothDirectoryInformation: - return (FIELD_OFFSET( FILE_BOTH_DIR_INFORMATION, FileName[len] ) + 3) & ~3; + return (FIELD_OFFSET( FILE_BOTH_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + case FileFullDirectoryInformation: + return (FIELD_OFFSET( FILE_FULL_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + case FileIdBothDirectoryInformation: + return (FIELD_OFFSET( FILE_ID_BOTH_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + case FileIdFullDirectoryInformation: + return (FIELD_OFFSET( FILE_ID_FULL_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; default: assert(0); } @@ -953,6 +965,7 @@ static union file_directory_info *append_entry( void *info_ptr, IO_STATUS_BLOCK struct stat st; WCHAR long_nameW[MAX_DIR_ENTRY_LEN]; WCHAR short_nameW[12]; + WCHAR *filename; UNICODE_STRING str; ULONG attributes = 0; @@ -1012,25 +1025,51 @@ static union file_directory_info *append_entry( void *info_ptr, IO_STATUS_BLOCK io->u.Status = STATUS_BUFFER_OVERFLOW; } info = (union file_directory_info *)((char *)info_ptr + io->Information); + /* all the structures start with a FileDirectoryInformation layout */ + fill_stat_info( &st, info, class ); + info->dir.NextEntryOffset = total_len; + info->dir.FileIndex = 0; /* NTFS always has 0 here, so let's not bother with it */ + info->dir.FileAttributes |= attributes; switch (class) { + case FileDirectoryInformation: + info->dir.FileNameLength = long_len * sizeof(WCHAR); + filename = info->dir.FileName; + break; + + case FileFullDirectoryInformation: + info->full.EaSize = 0; /* FIXME */ + info->full.FileNameLength = long_len * sizeof(WCHAR); + filename = info->full.FileName; + break; + + case FileIdFullDirectoryInformation: + info->id_full.EaSize = 0; /* FIXME */ + info->id_full.FileNameLength = long_len * sizeof(WCHAR); + filename = info->id_full.FileName; + break; + case FileBothDirectoryInformation: - fill_stat_info( &st, &info->both, class ); - info->both.NextEntryOffset = total_len; - info->both.FileIndex = 0; /* NTFS always has 0 here, so let's not bother with it */ - info->both.FileAttributes |= attributes; info->both.EaSize = 0; /* FIXME */ info->both.ShortNameLength = short_len * sizeof(WCHAR); for (i = 0; i < short_len; i++) info->both.ShortName[i] = toupperW(short_nameW[i]); info->both.FileNameLength = long_len * sizeof(WCHAR); - memcpy( info->both.FileName, long_nameW, - min( info->both.FileNameLength, - total_len - FIELD_OFFSET( FILE_BOTH_DIR_INFORMATION, FileName ))); + filename = info->both.FileName; + break; + + case FileIdBothDirectoryInformation: + info->id_both.EaSize = 0; /* FIXME */ + info->id_both.ShortNameLength = short_len * sizeof(WCHAR); + for (i = 0; i < short_len; i++) info->id_both.ShortName[i] = toupperW(short_nameW[i]); + info->id_both.FileNameLength = long_len * sizeof(WCHAR); + filename = info->id_both.FileName; break; + default: assert(0); } + memcpy( filename, long_nameW, total_len - ((char *)filename - (char *)info) ); io->Information += total_len; return info; } @@ -1650,7 +1689,11 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, } switch (info_class) { + case FileDirectoryInformation: case FileBothDirectoryInformation: + case FileFullDirectoryInformation: + case FileIdBothDirectoryInformation: + case FileIdFullDirectoryInformation: if (length < dir_info_size( info_class, 1 )) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; break; default:

1 0

Alexandre Julliard : ntdll: Use the common fill_stat_info function from the directory code too.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: da1df74147698dd083d438688736f62ef0ad571c URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1df74147698dd083d438688… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 17:23:55 2009 +0100 ntdll: Use the common fill_stat_info function from the directory code too. --- dlls/ntdll/directory.c | 32 ++++---------------- dlls/ntdll/file.c | 74 ++++++++++++++++++++++++++++++++++++++--------- dlls/ntdll/ntdll_misc.h | 2 + 3 files changed, 68 insertions(+), 40 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index e7f1dd4..6784e68 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -933,6 +933,7 @@ static FILE_BOTH_DIR_INFORMATION *append_entry( void *info_ptr, ULONG_PTR *pos, WCHAR long_nameW[MAX_DIR_ENTRY_LEN]; WCHAR short_nameW[12]; UNICODE_STRING str; + ULONG attributes = 0; long_len = ntdll_umbstowcs( 0, long_name, strlen(long_name), long_nameW, MAX_DIR_ENTRY_LEN ); if (long_len == -1) return NULL; @@ -973,45 +974,24 @@ static FILE_BOTH_DIR_INFORMATION *append_entry( void *info_ptr, ULONG_PTR *pos, if (*pos + total_len > max_length) total_len = max_length - *pos; - info->FileAttributes = 0; if (lstat( long_name, &st ) == -1) return NULL; if (S_ISLNK( st.st_mode )) { if (stat( long_name, &st ) == -1) return NULL; - if (S_ISDIR( st.st_mode )) info->FileAttributes |= FILE_ATTRIBUTE_REPARSE_POINT; + if (S_ISDIR( st.st_mode )) attributes |= FILE_ATTRIBUTE_REPARSE_POINT; } if (is_ignored_file( &st )) { TRACE( "ignoring file %s\n", long_name ); return NULL; } + if (!show_dot_files && long_name[0] == '.' && long_name[1] && (long_name[1] != '.' || long_name[2])) + attributes |= FILE_ATTRIBUTE_HIDDEN; + fill_stat_info( &st, info, FileBothDirectoryInformation ); info->NextEntryOffset = total_len; info->FileIndex = 0; /* NTFS always has 0 here, so let's not bother with it */ - - RtlSecondsSince1970ToTime( st.st_mtime, &info->CreationTime ); - RtlSecondsSince1970ToTime( st.st_mtime, &info->LastWriteTime ); - RtlSecondsSince1970ToTime( st.st_atime, &info->LastAccessTime ); - RtlSecondsSince1970ToTime( st.st_ctime, &info->ChangeTime ); - - if (S_ISDIR(st.st_mode)) - { - info->EndOfFile.QuadPart = info->AllocationSize.QuadPart = 0; - info->FileAttributes |= FILE_ATTRIBUTE_DIRECTORY; - } - else - { - info->EndOfFile.QuadPart = st.st_size; - info->AllocationSize.QuadPart = (ULONGLONG)st.st_blocks * 512; - info->FileAttributes |= FILE_ATTRIBUTE_ARCHIVE; - } - - if (!(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) - info->FileAttributes |= FILE_ATTRIBUTE_READONLY; - - if (!show_dot_files && long_name[0] == '.' && long_name[1] && (long_name[1] != '.' || long_name[2])) - info->FileAttributes |= FILE_ATTRIBUTE_HIDDEN; - + info->FileAttributes |= attributes; info->EaSize = 0; /* FIXME */ info->ShortNameLength = short_len * sizeof(WCHAR); for (i = 0; i < short_len; i++) info->ShortName[i] = toupperW(short_nameW[i]); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 8014e15..32e5f93 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1486,8 +1486,26 @@ NTSTATUS WINAPI NtSetVolumeInformationFile( return 0; } +static inline void get_file_times( const struct stat *st, LARGE_INTEGER *mtime, LARGE_INTEGER *ctime, + LARGE_INTEGER *atime, LARGE_INTEGER *creation ) +{ + RtlSecondsSince1970ToTime( st->st_mtime, mtime ); + RtlSecondsSince1970ToTime( st->st_ctime, ctime ); + RtlSecondsSince1970ToTime( st->st_atime, atime ); +#ifdef HAVE_STRUCT_STAT_ST_MTIM + mtime->QuadPart += st->st_mtim.tv_nsec / 100; +#endif +#ifdef HAVE_STRUCT_STAT_ST_CTIM + ctime->QuadPart += st->st_ctim.tv_nsec / 100; +#endif +#ifdef HAVE_STRUCT_STAT_ST_ATIM + atime->QuadPart += st->st_atim.tv_nsec / 100; +#endif + *creation = *mtime; +} + /* fill in the file information that depends on the stat info */ -static NTSTATUS fill_stat_info( const struct stat *st, void *ptr, FILE_INFORMATION_CLASS class ) +NTSTATUS fill_stat_info( const struct stat *st, void *ptr, FILE_INFORMATION_CLASS class ) { switch (class) { @@ -1495,23 +1513,12 @@ static NTSTATUS fill_stat_info( const struct stat *st, void *ptr, FILE_INFORMATI { FILE_BASIC_INFORMATION *info = ptr; + get_file_times( st, &info->LastWriteTime, &info->ChangeTime, + &info->LastAccessTime, &info->CreationTime ); if (S_ISDIR(st->st_mode)) info->FileAttributes = FILE_ATTRIBUTE_DIRECTORY; else info->FileAttributes = FILE_ATTRIBUTE_ARCHIVE; if (!(st->st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) info->FileAttributes |= FILE_ATTRIBUTE_READONLY; - RtlSecondsSince1970ToTime( st->st_mtime, &info->LastWriteTime ); - RtlSecondsSince1970ToTime( st->st_ctime, &info->ChangeTime ); - RtlSecondsSince1970ToTime( st->st_atime, &info->LastAccessTime ); -#ifdef HAVE_STRUCT_STAT_ST_MTIM - info->LastWriteTime.QuadPart += st->st_mtim.tv_nsec / 100; -#endif -#ifdef HAVE_STRUCT_STAT_ST_CTIM - info->ChangeTime.QuadPart += st->st_ctim.tv_nsec / 100; -#endif -#ifdef HAVE_STRUCT_STAT_ST_ATIM - info->LastAccessTime.QuadPart += st->st_atim.tv_nsec / 100; -#endif - info->CreationTime = info->LastWriteTime; } break; case FileStandardInformation: @@ -1552,6 +1559,45 @@ static NTSTATUS fill_stat_info( const struct stat *st, void *ptr, FILE_INFORMATI fill_stat_info( st, &info->InternalInformation, FileInternalInformation ); } break; + /* all directory structures start with the FileDirectoryInformation layout */ + case FileBothDirectoryInformation: + case FileFullDirectoryInformation: + case FileDirectoryInformation: + { + FILE_DIRECTORY_INFORMATION *info = ptr; + + get_file_times( st, &info->LastWriteTime, &info->ChangeTime, + &info->LastAccessTime, &info->CreationTime ); + if (S_ISDIR(st->st_mode)) + { + info->AllocationSize.QuadPart = 0; + info->EndOfFile.QuadPart = 0; + info->FileAttributes = FILE_ATTRIBUTE_DIRECTORY; + } + else + { + info->AllocationSize.QuadPart = (ULONGLONG)st->st_blocks * 512; + info->EndOfFile.QuadPart = st->st_size; + info->FileAttributes = FILE_ATTRIBUTE_ARCHIVE; + } + if (!(st->st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) + info->FileAttributes |= FILE_ATTRIBUTE_READONLY; + } + break; + case FileIdFullDirectoryInformation: + { + FILE_ID_FULL_DIRECTORY_INFORMATION *info = ptr; + info->FileId.QuadPart = st->st_ino; + fill_stat_info( st, info, FileDirectoryInformation ); + } + break; + case FileIdBothDirectoryInformation: + { + FILE_ID_BOTH_DIRECTORY_INFORMATION *info = ptr; + info->FileId.QuadPart = st->st_ino; + fill_stat_info( st, info, FileDirectoryInformation ); + } + break; default: return STATUS_INVALID_INFO_CLASS; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index b3842e0..be6c770 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -138,7 +138,9 @@ extern NTSTATUS TAPE_DeviceIoControl(HANDLE hDevice, LPVOID lpOutBuffer, DWORD nOutBufferSize); /* file I/O */ +struct stat; extern NTSTATUS FILE_GetNtStatus(void); +extern NTSTATUS fill_stat_info( const struct stat *st, void *ptr, FILE_INFORMATION_CLASS class ); extern void DIR_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir ); extern BOOL DIR_is_hidden_file( const UNICODE_STRING *name ); extern NTSTATUS DIR_unmount_device( HANDLE handle );

1 0

Alexandre Julliard : ntdll: Add a common function to compute file information from the stat data.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: c3b602aa23466dc368090188d1fed6489595d69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3b602aa23466dc368090188d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 17:01:15 2009 +0100 ntdll: Add a common function to compute file information from the stat data. --- dlls/ntdll/file.c | 245 ++++++++++++++++++++++++++--------------------------- 1 files changed, 120 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3b602aa23466dc368090…

1 0

Alexandre Julliard : ntdll: Pass the full I/ O status block to append_entry and have it set the status code on overflow.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: c843665c12fb7b27253aee79ffcba09ed939ea68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c843665c12fb7b27253aee79f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 17:37:15 2009 +0100 ntdll: Pass the full I/O status block to append_entry and have it set the status code on overflow. --- dlls/ntdll/directory.c | 75 ++++++++++++++++++++--------------------------- 1 files changed, 32 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c843665c12fb7b27253ae…

1 0

Maarten Lankhorst : include: Fix timer APC callback definition.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 6e0e0dc605d93d709947ced745a8187d9dcf2bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e0e0dc605d93d709947ced74… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 18 12:11:36 2009 +0100 include: Fix timer APC callback definition. --- include/winternl.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index fe77359..d38f49c 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1782,7 +1782,7 @@ typedef struct _KEY_MULTIPLE_VALUE_INFORMATION typedef VOID (CALLBACK *PRTL_OVERLAPPED_COMPLETION_ROUTINE)(DWORD,DWORD,LPVOID); -typedef VOID (*PTIMER_APC_ROUTINE) ( PVOID, ULONG, LONG ); +typedef VOID (CALLBACK *PTIMER_APC_ROUTINE) ( PVOID, ULONG, LONG ); typedef enum _EVENT_TYPE { NotificationEvent,

1 0

Huw Davies : wineps.drv: Rename variable to stride.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 05472017fef284d53a7c7d34a0c68832ed7bffe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05472017fef284d53a7c7d34a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 18 12:20:17 2009 +0000 wineps.drv: Rename variable to stride. --- dlls/wineps.drv/bitmap.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index 0c350d2..9f5f11d 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -228,7 +228,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w const BITMAPINFO *info, UINT wUsage, DWORD dwRop ) { LONG fullSrcWidth, fullSrcHeight; - INT widthbytes; + INT stride; WORD bpp, compression; INT line; POINT pt[2]; @@ -241,7 +241,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w if (!get_bitmap_info( info, &fullSrcWidth, &fullSrcHeight, &bpp, &compression )) return FALSE; - widthbytes = get_dib_width_bytes(fullSrcWidth, bpp); + stride = get_dib_width_bytes(fullSrcWidth, bpp); TRACE("full size=%dx%d bpp=%d compression=%d rop=%08x\n", fullSrcWidth, fullSrcHeight, bpp, compression, dwRop); @@ -272,12 +272,12 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageMaskHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); if(xSrc & 7) FIXME("This won't work...\n"); bitmap_size = heightSrc * ((widthSrc + 7) / 8); dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes, dst_ptr += ((widthSrc + 7) / 8)) + for(line = 0; line < heightSrc; line++, src_ptr += stride, dst_ptr += ((widthSrc + 7) / 8)) memcpy(dst_ptr, src_ptr + xSrc / 8, (widthSrc + 7) / 8); break; @@ -287,12 +287,12 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); if(xSrc & 1) FIXME("This won't work...\n"); bitmap_size = heightSrc * ((widthSrc + 1) / 2); dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes, dst_ptr += ((widthSrc + 1) / 2)) + for(line = 0; line < heightSrc; line++, src_ptr += stride, dst_ptr += ((widthSrc + 1) / 2)) memcpy(dst_ptr, src_ptr + xSrc/2, (widthSrc+1)/2); break; @@ -302,10 +302,10 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes, dst_ptr += widthSrc) + for(line = 0; line < heightSrc; line++, src_ptr += stride, dst_ptr += widthSrc) memcpy(dst_ptr, src_ptr + xSrc, widthSrc); break; @@ -318,11 +318,11 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes) { + for(line = 0; line < heightSrc; line++, src_ptr += stride) { const WORD *words = (const WORD *)src_ptr + xSrc; int i; for(i = 0; i < widthSrc; i++) { @@ -350,10 +350,10 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w widthSrc, heightSrc); src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes) { + for(line = 0; line < heightSrc; line++, src_ptr += stride) { const BYTE *byte = src_ptr + xSrc * 3; int i; for(i = 0; i < widthSrc; i++) { @@ -372,10 +372,10 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w widthSrc, heightSrc); src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes) { + for(line = 0; line < heightSrc; line++, src_ptr += stride) { const BYTE *byte = src_ptr + xSrc * 4; int i; for(i = 0; i < widthSrc; i++) {

1 0

Paul Vriens : crypt32/tests: Fix a test failure on older crypt32.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 7f5b24ed9186d457acd7803a97d4171f332c5fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5b24ed9186d457acd7803a9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 18 15:12:52 2009 +0100 crypt32/tests: Fix a test failure on older crypt32. --- dlls/crypt32/tests/cert.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 4a1c449..0bc4fda 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2709,7 +2709,9 @@ static void testIsRDNAttrsInCertificateName(void) "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG, &name, &rdn); - ok(ret, "CertIsRDNAttrsInCertificateName failed: %08x\n", GetLastError()); + ok(ret || + broken(!ret && GetLastError() == CRYPT_E_NO_MATCH), /* Older crypt32 */ + "CertIsRDNAttrsInCertificateName failed: %08x\n", GetLastError()); /* The values don't match unless they have the same RDN type */ attr[0].dwValueType = CERT_RDN_UNICODE_STRING; attr[0].Value.cbData = lstrlenW(juanW) * sizeof(WCHAR);

1 0

Roderick Colenbrander : opengl32: Sync with latest OpenGL extensions.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 21bc1ddf932615c63dd4223fb9c53a5ffba0f41c URL: http://source.winehq.org/git/wine.git/?a=commit;h=21bc1ddf932615c63dd4223fb… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Nov 18 12:58:41 2009 +0100 opengl32: Sync with latest OpenGL extensions. --- dlls/opengl32/make_opengl | 3 + dlls/opengl32/opengl_ext.c | 438 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 441 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21bc1ddf932615c63dd42…

1 0

Alexandre Julliard : include: Add some more definitions for FILE_INFORMATION_CLASS.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 44f520a5b6f2bd6ec6da8793177711e57bda9c72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f520a5b6f2bd6ec6da87931… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 15:15:32 2009 +0100 include: Add some more definitions for FILE_INFORMATION_CLASS. --- dlls/ntdll/file.c | 20 +++++++++++++++++++- include/winternl.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b62c7c2..984f466 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1578,7 +1578,25 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, 0, /* FileReparsePointInformation */ 0, /* FileNetworkOpenInformation */ 0, /* FileAttributeTagInformation */ - 0 /* FileTrackingInformation */ + 0, /* FileTrackingInformation */ + 0, /* FileIdBothDirectoryInformation */ + 0, /* FileIdFullDirectoryInformation */ + 0, /* FileValidDataLengthInformation */ + 0, /* FileShortNameInformation */ + 0, + 0, + 0, + 0, /* FileSfioReserveInformation */ + 0, /* FileSfioVolumeInformation */ + 0, /* FileHardLinkInformation */ + 0, + 0, /* FileNormalizedNameInformation */ + 0, + 0, /* FileIdGlobalTxDirectoryInformation */ + 0, + 0, + 0, + 0 /* FileStandardLinkInformation */ }; struct stat st; diff --git a/include/winternl.h b/include/winternl.h index 633239f..fe77359 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -407,6 +407,20 @@ typedef enum _FILE_INFORMATION_CLASS { FileNetworkOpenInformation, FileAttributeTagInformation, FileTrackingInformation, + FileIdBothDirectoryInformation, + FileIdFullDirectoryInformation, + FileValidDataLengthInformation, + FileShortNameInformation = 40, + /* 41, 42, 43 undocumented */ + FileSfioReserveInformation = 44, + FileSfioVolumeInformation = 45, + FileHardLinkInformation = 46, + /* 47 undocumented */ + FileNormalizedNameInformation = 48, + /* 49 undocumented */ + FileIdGlobalTxDirectoryInformation = 50, + /* 51, 52, 53 undocumented */ + FileStandardLinkInformation = 54, FileMaximumInformation } FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS; @@ -440,6 +454,22 @@ typedef struct _FILE_FULL_DIRECTORY_INFORMATION { } FILE_FULL_DIRECTORY_INFORMATION, *PFILE_FULL_DIRECTORY_INFORMATION, FILE_FULL_DIR_INFORMATION, *PFILE_FULL_DIR_INFORMATION; +typedef struct _FILE_ID_FULL_DIRECTORY_INFORMATION { + ULONG NextEntryOffset; + ULONG FileIndex; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER EndOfFile; + LARGE_INTEGER AllocationSize; + ULONG FileAttributes; + ULONG FileNameLength; + ULONG EaSize; + LARGE_INTEGER FileId; + WCHAR FileName[ANYSIZE_ARRAY]; +} FILE_ID_FULL_DIRECTORY_INFORMATION, *PFILE_ID_FULL_DIRECTORY_INFORMATION; + typedef struct _FILE_BOTH_DIRECTORY_INFORMATION { ULONG NextEntryOffset; ULONG FileIndex; @@ -458,6 +488,24 @@ typedef struct _FILE_BOTH_DIRECTORY_INFORMATION { } FILE_BOTH_DIRECTORY_INFORMATION, *PFILE_BOTH_DIRECTORY_INFORMATION, FILE_BOTH_DIR_INFORMATION, *PFILE_BOTH_DIR_INFORMATION; +typedef struct _FILE_ID_BOTH_DIRECTORY_INFORMATION { + ULONG NextEntryOffset; + ULONG FileIndex; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER EndOfFile; + LARGE_INTEGER AllocationSize; + ULONG FileAttributes; + ULONG FileNameLength; + ULONG EaSize; + CHAR ShortNameLength; + WCHAR ShortName[12]; + LARGE_INTEGER FileId; + WCHAR FileName[ANYSIZE_ARRAY]; +} FILE_ID_BOTH_DIRECTORY_INFORMATION, *PFILE_ID_BOTH_DIRECTORY_INFORMATION; + typedef struct _FILE_BASIC_INFORMATION { LARGE_INTEGER CreationTime; LARGE_INTEGER LastAccessTime;

1 0