November 2009 - Wine-commits

Austin English : winex11.drv: Downgrade an ERR to a WARN.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: a3cf7a4e0657a82ad53f34b1a61213d867ce4e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3cf7a4e0657a82ad53f34b1a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 18 14:09:20 2009 -0600 winex11.drv: Downgrade an ERR to a WARN. --- dlls/winex11.drv/bitmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 47d2562..5992b31 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -144,7 +144,7 @@ BOOL CDECL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID /* check if bpp is compatible with screen depth */ if (!((bitmap.bmBitsPixel == 1) || (bitmap.bmBitsPixel == screen_bpp))) { - ERR("Trying to make bitmap with planes=%d, bpp=%d\n", + WARN("Trying to make bitmap with planes=%d, bpp=%d\n", bitmap.bmPlanes, bitmap.bmBitsPixel); return FALSE; }

1 0

Vincent Povirk : ole32: Invalidate child streams when a non-top-level storage is freed.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 55604eb36c4d569464a9f154ff30b4fdd4987c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55604eb36c4d569464a9f154f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 18 10:16:13 2009 -0600 ole32: Invalidate child streams when a non-top-level storage is freed. --- dlls/ole32/storage32.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index b6de7ae..df0305d 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3485,6 +3485,8 @@ static void StorageInternalImpl_Destroy( StorageBaseImpl *iface) { StorageInternalImpl* This = (StorageInternalImpl*) iface; + StorageBaseImpl_DeleteAll(&This->base); + HeapFree(GetProcessHeap(), 0, This); }

1 0

Vincent Povirk : ole32: Add a test for freeing the parent of an open stream .
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: a2c405fa15d8a38d970cc24c9a790437efc5cc15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c405fa15d8a38d970cc24c9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 17 11:20:34 2009 -0600 ole32: Add a test for freeing the parent of an open stream. --- dlls/ole32/tests/storage32.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index e4783e8..b908ea5 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1288,6 +1288,50 @@ static void test_revert(void) ok( r == TRUE, "deleted file\n"); } +static void test_parent_free(void) +{ + IStorage *stg = NULL, *stg2 = NULL; + HRESULT r; + IStream *stm = NULL; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; + ULONG ref; + + DeleteFileA(filenameA); + + /* create the file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE |STGM_TRANSACTED, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* commit a new storage */ + r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + if (r == S_OK) + { + /* now create a stream inside the new storage */ + r = IStorage_CreateStream(stg2, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + ref = IStorage_Release(stg2); + ok(ref == 0, "IStorage still has %u references\n", ref); + + if (r == S_OK) + { + r = IStream_Write(stm, "this should fail\n", 17, NULL); + ok(r==STG_E_REVERTED, "IStream->Write sould fail, hr=%x\n", r); + + IStream_Release(stm); + } + } + + IStorage_Release(stg); + + r = DeleteFileA(filenameA); + ok( r == TRUE, "deleted file\n"); +} + static void test_nonroot_transacted(void) { IStorage *stg = NULL, *stg2 = NULL; @@ -2422,6 +2466,7 @@ START_TEST(storage32) test_transact(); test_substorage_share(); test_revert(); + test_parent_free(); test_nonroot_transacted(); test_ReadClassStm(); test_access();

1 0

Vincent Povirk : ole32: Always invalidate stream objects when deleting the stream.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 9d0c4c971d56a74aac9599e5771bbbdd57906f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0c4c971d56a74aac9599e57… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 18 10:22:50 2009 -0600 ole32: Always invalidate stream objects when deleting the stream. --- dlls/ole32/storage32.c | 23 ++++++++++++----------- dlls/ole32/tests/storage32.c | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index df0305d..96e3e00 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -823,17 +823,6 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( */ if (STGM_CREATE_MODE(grfMode) == STGM_CREATE) { - StgStreamImpl *strm; - - LIST_FOR_EACH_ENTRY(strm, &This->strmHead, StgStreamImpl, StrmListEntry) - { - if (strm->dirEntry == currentEntryRef) - { - TRACE("Stream deleted %p\n", strm); - strm->parentStorage = NULL; - list_remove(&strm->StrmListEntry); - } - } IStorage_DestroyElement(iface, pwcsName); } else @@ -1914,6 +1903,18 @@ static HRESULT deleteStreamContents( IStream *pis; HRESULT hr; ULARGE_INTEGER size; + StgStreamImpl *strm; + + /* Invalidate any open stream objects. */ + LIST_FOR_EACH_ENTRY(strm, &parentStorage->strmHead, StgStreamImpl, StrmListEntry) + { + if (strm->dirEntry == indexToDelete) + { + TRACE("Stream deleted %p\n", strm); + strm->parentStorage = NULL; + list_remove(&strm->StrmListEntry); + } + } size.u.HighPart = 0; size.u.LowPart = 0; diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b908ea5..8fa300f 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1121,7 +1121,7 @@ static void test_substorage_share(void) ok(r==S_OK, "IStorage->DestroyElement failed, hr=%08x\n", r); r = IStream_Write(stm, "this shouldn't work\n", 20, NULL); - todo_wine ok(r==STG_E_REVERTED, "IStream_Write should fail %08x\n", r); + ok(r==STG_E_REVERTED, "IStream_Write should fail %08x\n", r); IStorage_Release(stm); }

1 0

Vincent Povirk : ole32: Use safe list iteration when searching for streams to invalidate.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 53128d522b44759d60cdb38586be52ba22b4f0e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53128d522b44759d60cdb3858… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 18 10:27:16 2009 -0600 ole32: Use safe list iteration when searching for streams to invalidate. --- dlls/ole32/storage32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 96e3e00..4cfc76f 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1903,10 +1903,10 @@ static HRESULT deleteStreamContents( IStream *pis; HRESULT hr; ULARGE_INTEGER size; - StgStreamImpl *strm; + StgStreamImpl *strm, *strm2; /* Invalidate any open stream objects. */ - LIST_FOR_EACH_ENTRY(strm, &parentStorage->strmHead, StgStreamImpl, StrmListEntry) + LIST_FOR_EACH_ENTRY_SAFE(strm, strm2, &parentStorage->strmHead, StgStreamImpl, StrmListEntry) { if (strm->dirEntry == indexToDelete) {

1 0

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

19 Nov '09

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: Use the common fill_stat_info function from the directory code too.
by Alexandre Julliard 19 Nov '09

19 Nov '09

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: Pass the full I/ O status block to append_entry and have it set the status code on overflow.
by Alexandre Julliard 19 Nov '09

19 Nov '09

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

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

19 Nov '09

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: Pass the NtQueryDirectoryFile info class down into the various helper functions .
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: ee9b19ab5f20e43d016c98fd517a4347823a205a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee9b19ab5f20e43d016c98fd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 17:47:37 2009 +0100 ntdll: Pass the NtQueryDirectoryFile info class down into the various helper functions. --- dlls/ntdll/directory.c | 96 ++++++++++++++++++++++++++---------------------- 1 files changed, 52 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee9b19ab5f20e43d016c9…

1 0