December 2009 - Wine-Commits

Marcus Meissner : dbghelp: Check wImageName for NULL (Coverity).
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: d6f78e4014a8a493e9e8cd488cd05d86d3b2abc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f78e4014a8a493e9e8cd488… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Dec 1 10:48:56 2009 +0100 dbghelp: Check wImageName for NULL (Coverity). --- dlls/dbghelp/module.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index a6778e7..1920dca 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -534,6 +534,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Flags & SLMFLAG_VIRTUAL) { + if (!wImageName) return FALSE; module = module_new(pcs, wImageName, module_get_type_by_name(wImageName), TRUE, (DWORD)BaseOfDll, SizeOfDll, 0, 0); if (!module) return FALSE; @@ -594,7 +595,8 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam */ if (wModuleName) module_set_module(module, wModuleName); - lstrcpynW(module->module.ImageName, wImageName, + if (wImageName) + lstrcpynW(module->module.ImageName, wImageName, sizeof(module->module.ImageName) / sizeof(WCHAR)); return module->module.BaseOfImage;

1 0

Marcus Meissner : cryptnet: Added a potentially missing NULL ptr check ( Coverity).
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: 28c6c44df4ff07ec23bac00ac8f4c4b581b224ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c6c44df4ff07ec23bac00ac… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Dec 1 10:26:48 2009 +0100 cryptnet: Added a potentially missing NULL ptr check (Coverity). --- dlls/cryptnet/cryptnet_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index afae942..34bbc58 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1616,7 +1616,8 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, NULL); if (dwFlags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION) retrievalFlags |= CRYPT_CACHE_ONLY_RETRIEVAL; - if (dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG && + if ((dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) && + pRevPara && pRevPara->cbSize >= offsetof(CERT_REVOCATION_PARA, dwUrlRetrievalTimeout) + sizeof(DWORD)) {

1 0

Hans Leidekker : advapi32: Improve the stub for GetEffectiveRightsFromAclA.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: c0d79c475b9bf815317a1ce69b9821be88c51d75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0d79c475b9bf815317a1ce69… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 1 11:35:50 2009 +0100 advapi32: Improve the stub for GetEffectiveRightsFromAclA. --- dlls/advapi32/security.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 3e79a61..629a74a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1100,7 +1100,8 @@ GetEffectiveRightsFromAclA( PACL pacl, PTRUSTEEA pTrustee, PACCESS_MASK pAccessR { FIXME("%p %p %p - stub\n", pacl, pTrustee, pAccessRights); - return 1; + *pAccessRights = STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL; + return 0; } DWORD WINAPI

1 0

Henri Verbeet : ntdll/tests: Add some tests for FileAllInformation name information.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: 64e6e956e527675f57bc7f228a9f2b59f6a42c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e6e956e527675f57bc7f228… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 1 11:27:46 2009 +0100 ntdll/tests: Add some tests for FileAllInformation name information. This is essentially a copy of test_file_name_information(). --- dlls/ntdll/tests/file.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 141 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 8eff7d3..129444a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1075,6 +1075,146 @@ static void test_file_name_information(void) HeapFree( GetProcessHeap(), 0, file_name ); } +static void test_file_all_name_information(void) +{ + WCHAR *file_name, *volume_prefix, *expected; + FILE_ALL_INFORMATION *info; + ULONG old_redir = 1, tmp; + UINT file_name_size; + IO_STATUS_BLOCK io; + UINT info_size; + HRESULT hr; + HANDLE h; + UINT len; + + /* GetVolumePathName is not present before w2k */ + if (!pGetVolumePathNameW) { + win_skip("GetVolumePathNameW not found\n"); + return; + } + + file_name_size = GetSystemDirectoryW( NULL, 0 ); + file_name = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*file_name) ); + volume_prefix = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); + expected = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); + + len = GetSystemDirectoryW( file_name, file_name_size ); + ok(len == file_name_size - 1, + "GetSystemDirectoryW returned %u, expected %u.\n", + len, file_name_size - 1); + + len = pGetVolumePathNameW( file_name, volume_prefix, file_name_size ); + ok(len, "GetVolumePathNameW failed.\n"); + + len = lstrlenW( volume_prefix ); + if (len && volume_prefix[len - 1] == '\\') --len; + memcpy( expected, file_name + len, (file_name_size - len - 1) * sizeof(WCHAR) ); + expected[file_name_size - len - 1] = '\0'; + + /* A bit more than we actually need, but it keeps the calculation simple. */ + info_size = sizeof(*info) + (file_name_size * sizeof(WCHAR)); + info = HeapAlloc( GetProcessHeap(), 0, info_size ); + + if (pRtlWow64EnableFsRedirectionEx) pRtlWow64EnableFsRedirectionEx( TRUE, &old_redir ); + h = CreateFileW( file_name, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); + if (pRtlWow64EnableFsRedirectionEx) pRtlWow64EnableFsRedirectionEx( old_redir, &tmp ); + ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); + + hr = pNtQueryInformationFile( h, &io, info, sizeof(*info) - 1, FileAllInformation ); + ok(hr == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile returned %#x, expected %#x.\n", + hr, STATUS_INFO_LENGTH_MISMATCH); + + memset( info, 0xcc, info_size ); + hr = pNtQueryInformationFile( h, &io, info, sizeof(*info), FileAllInformation ); + ok(hr == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#x, expected %#x.\n", + hr, STATUS_BUFFER_OVERFLOW); + ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#x, expected %#x.\n", + U(io).Status, STATUS_BUFFER_OVERFLOW); + ok(info->NameInformation.FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), + "info->NameInformation.FileNameLength is %u, expected %u.\n", + info->NameInformation.FileNameLength, lstrlenW( expected ) * sizeof(WCHAR)); + ok(info->NameInformation.FileName[2] == 0xcccc, + "info->NameInformation.FileName[2] is %#x, expected 0xcccc.\n", info->NameInformation.FileName[2]); + ok(CharLowerW((LPWSTR)(UINT_PTR)info->NameInformation.FileName[1]) == CharLowerW((LPWSTR)(UINT_PTR)expected[1]), + "info->NameInformation.FileName[1] is %p, expected %p.\n", + CharLowerW((LPWSTR)(UINT_PTR)info->NameInformation.FileName[1]), CharLowerW((LPWSTR)(UINT_PTR)expected[1])); + ok(io.Information == sizeof(*info), "io.Information is %lu, expected %u.\n", io.Information, sizeof(*info)); + + memset( info, 0xcc, info_size ); + hr = pNtQueryInformationFile( h, &io, info, info_size, FileAllInformation ); + ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); + ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_SUCCESS); + ok(info->NameInformation.FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), + "info->NameInformation.FileNameLength is %u, expected %u.\n", + info->NameInformation.FileNameLength, lstrlenW( expected ) * sizeof(WCHAR)); + ok(info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)] == 0xcccc, + "info->NameInformation.FileName[%u] is %#x, expected 0xcccc.\n", + info->NameInformation.FileNameLength / sizeof(WCHAR), + info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)]); + info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)] = '\0'; + ok(!lstrcmpiW( info->NameInformation.FileName, expected ), + "info->NameInformation.FileName is %s, expected %s.\n", + wine_dbgstr_w( info->NameInformation.FileName ), wine_dbgstr_w( expected )); + ok(io.Information == FIELD_OFFSET(FILE_ALL_INFORMATION, NameInformation.FileName) + + info->NameInformation.FileNameLength, + "io.Information is %lu, expected %u.\n", + io.Information, + FIELD_OFFSET(FILE_ALL_INFORMATION, NameInformation.FileName) + info->NameInformation.FileNameLength); + + CloseHandle( h ); + HeapFree( GetProcessHeap(), 0, info ); + HeapFree( GetProcessHeap(), 0, expected ); + HeapFree( GetProcessHeap(), 0, volume_prefix ); + + if (old_redir || !pGetSystemWow64DirectoryW || !(file_name_size = pGetSystemWow64DirectoryW( NULL, 0 ))) + { + skip("Not running on WoW64, skipping test.\n"); + HeapFree( GetProcessHeap(), 0, file_name ); + return; + } + + h = CreateFileW( file_name, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); + ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); + HeapFree( GetProcessHeap(), 0, file_name ); + + file_name = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*file_name) ); + volume_prefix = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); + expected = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*expected) ); + + len = pGetSystemWow64DirectoryW( file_name, file_name_size ); + ok(len == file_name_size - 1, + "GetSystemWow64DirectoryW returned %u, expected %u.\n", + len, file_name_size - 1); + + len = pGetVolumePathNameW( file_name, volume_prefix, file_name_size ); + ok(len, "GetVolumePathNameW failed.\n"); + + len = lstrlenW( volume_prefix ); + if (len && volume_prefix[len - 1] == '\\') --len; + memcpy( expected, file_name + len, (file_name_size - len - 1) * sizeof(WCHAR) ); + expected[file_name_size - len - 1] = '\0'; + + info_size = sizeof(*info) + (file_name_size * sizeof(WCHAR)); + info = HeapAlloc( GetProcessHeap(), 0, info_size ); + + memset( info, 0xcc, info_size ); + hr = pNtQueryInformationFile( h, &io, info, info_size, FileAllInformation ); + ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); + info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)] = '\0'; + ok(!lstrcmpiW( info->NameInformation.FileName, expected ), "info->NameInformation.FileName is %s, expected %s.\n", + wine_dbgstr_w( info->NameInformation.FileName ), wine_dbgstr_w( expected )); + + CloseHandle( h ); + HeapFree( GetProcessHeap(), 0, info ); + HeapFree( GetProcessHeap(), 0, expected ); + HeapFree( GetProcessHeap(), 0, volume_prefix ); + HeapFree( GetProcessHeap(), 0, file_name ); +} + START_TEST(file) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); @@ -1115,4 +1255,5 @@ START_TEST(file) test_file_all_information(); test_file_both_information(); test_file_name_information(); + test_file_all_name_information(); }

1 0

Henri Verbeet : ntdll: Also return name information for FileAllInformation.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: 0eac2ce19b2c281a5439a9ce8983f425150091cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eac2ce19b2c281a5439a9ce8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 1 11:27:45 2009 +0100 ntdll: Also return name information for FileAllInformation. --- dlls/ntdll/file.c | 64 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 37 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 71c8cba..a43291e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1639,6 +1639,33 @@ static NTSTATUS server_get_unix_name( HANDLE handle, ANSI_STRING *unix_name ) return ret; } +static NTSTATUS fill_name_info( const ANSI_STRING *unix_name, FILE_NAME_INFORMATION *info, LONG *name_len ) +{ + UNICODE_STRING nt_name; + NTSTATUS status; + + if (!(status = wine_unix_to_nt_file_name( unix_name, &nt_name ))) + { + const WCHAR *ptr = nt_name.Buffer; + const WCHAR *end = ptr + (nt_name.Length / sizeof(WCHAR)); + + /* Skip the volume mount point. */ + while (ptr != end && *ptr == '\\') ++ptr; + while (ptr != end && *ptr != '\\') ++ptr; + while (ptr != end && *ptr == '\\') ++ptr; + while (ptr != end && *ptr != '\\') ++ptr; + + info->FileNameLength = (end - ptr) * sizeof(WCHAR); + if (*name_len < info->FileNameLength) status = STATUS_BUFFER_OVERFLOW; + else *name_len = info->FileNameLength; + + memcpy( info->FileName, ptr, *name_len ); + RtlFreeUnicodeString( &nt_name ); + } + + return status; +} + /****************************************************************************** * NtQueryInformationFile [NTDLL.@] * ZwQueryInformationFile [NTDLL.@] @@ -1788,12 +1815,15 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, case FileAllInformation: { FILE_ALL_INFORMATION *info = ptr; + ANSI_STRING unix_name; if (fstat( fd, &st ) == -1) io->u.Status = FILE_GetNtStatus(); else if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) io->u.Status = STATUS_INVALID_INFO_CLASS; - else + else if (!(io->u.Status = server_get_unix_name( hFile, &unix_name ))) { + LONG name_len = len - FIELD_OFFSET(FILE_ALL_INFORMATION, NameInformation.FileName); + fill_stat_info( &st, info, FileAllInformation ); info->StandardInformation.DeletePending = FALSE; /* FIXME */ info->EaInformation.EaSize = 0; @@ -1801,8 +1831,10 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, info->PositionInformation.CurrentByteOffset.QuadPart = lseek( fd, 0, SEEK_CUR ); info->ModeInformation.Mode = 0; /* FIXME */ info->AlignmentInformation.AlignmentRequirement = 1; /* FIXME */ - info->NameInformation.FileNameLength = 0; - io->Information = sizeof(*info) - sizeof(WCHAR); + + io->u.Status = fill_name_info( &unix_name, &info->NameInformation, &name_len ); + RtlFreeAnsiString( &unix_name ); + io->Information = FIELD_OFFSET(FILE_ALL_INFORMATION, NameInformation.FileName) + name_len; } } break; @@ -1879,31 +1911,9 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, if (!(io->u.Status = server_get_unix_name( hFile, &unix_name ))) { LONG name_len = len - FIELD_OFFSET(FILE_NAME_INFORMATION, FileName); - UNICODE_STRING nt_name; - - io->u.Status = wine_unix_to_nt_file_name( &unix_name, &nt_name ); + io->u.Status = fill_name_info( &unix_name, info, &name_len ); RtlFreeAnsiString( &unix_name ); - - if (!io->u.Status) - { - const WCHAR *ptr = nt_name.Buffer; - const WCHAR *end = ptr + (nt_name.Length / sizeof(WCHAR)); - - /* Skip the volume mount point. */ - while (ptr != end && *ptr == '\\') ++ptr; - while (ptr != end && *ptr != '\\') ++ptr; - while (ptr != end && *ptr == '\\') ++ptr; - while (ptr != end && *ptr != '\\') ++ptr; - - info->FileNameLength = (end - ptr) * sizeof(WCHAR); - if (name_len < info->FileNameLength) io->u.Status = STATUS_BUFFER_OVERFLOW; - else name_len = info->FileNameLength; - - memcpy( info->FileName, ptr, name_len ); - RtlFreeUnicodeString( &nt_name ); - - io->Information = FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + name_len; - } + io->Information = FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + name_len; } } break;

1 0

Henri Verbeet : ntdll: Fix the FileAllInformation info size.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: c99abc651b1b3628106f065fc3363a2e3babee7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c99abc651b1b3628106f065fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 1 11:27:44 2009 +0100 ntdll: Fix the FileAllInformation info size. --- dlls/ntdll/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 32e5f93..71c8cba 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1679,7 +1679,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, sizeof(FILE_FULL_EA_INFORMATION), /* FileFullEaInformation */ sizeof(FILE_MODE_INFORMATION), /* FileModeInformation */ sizeof(FILE_ALIGNMENT_INFORMATION), /* FileAlignmentInformation */ - sizeof(FILE_ALL_INFORMATION)-sizeof(WCHAR), /* FileAllInformation */ + sizeof(FILE_ALL_INFORMATION), /* FileAllInformation */ sizeof(FILE_ALLOCATION_INFORMATION), /* FileAllocationInformation */ sizeof(FILE_END_OF_FILE_INFORMATION), /* FileEndOfFileInformation */ 0, /* FileAlternateNameInformation */

1 0

Henri Verbeet : d3d9/tests: Trace the viewport in clear_test().
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: bdad5ace2a4c2cab76a54c91cb6dae7b24f8382c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdad5ace2a4c2cab76a54c91c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 1 11:27:48 2009 +0100 d3d9/tests: Trace the viewport in clear_test(). There are some failures in this test on Win7 that appear to be related to the initial viewport. Perhaps this trace will help narrow it down. --- dlls/d3d9/tests/visual.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b871ad7..18a69c6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -495,6 +495,9 @@ static void clear_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_GetViewport(device, &old_vp); ok(hr == D3D_OK, "IDirect3DDevice9_GetViewport failed with %08x\n", hr); + trace("viewport: X %u, Y %u, W %u, H %u, MinZ %.8e, MaxZ %.8e.\n", + old_vp.X, old_vp.Y, old_vp.Width, old_vp.Height, old_vp.MinZ, old_vp.MaxZ); + vp.X = 160; vp.Y = 120; vp.Width = 160;

1 0

Alexandre Julliard : server: Don't set last error in get_handle(), move that into the callers.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: 1a6c4721157c38538a2badd0ab9fdc2ec38ff96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a6c4721157c38538a2badd0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 13:49:43 2009 +0100 server: Don't set last error in get_handle(), move that into the callers. --- server/handle.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/server/handle.c b/server/handle.c index 4f02154..d1b6a14 100644 --- a/server/handle.c +++ b/server/handle.c @@ -286,17 +286,13 @@ static struct handle_entry *get_handle( struct process *process, obj_handle_t ha handle = handle_global_to_local(handle); table = global_table; } - if (!table) goto error; + if (!table) return NULL; index = handle_to_index( handle ); - if (index < 0) goto error; - if (index > table->last) goto error; + if (index < 0) return NULL; + if (index > table->last) return NULL; entry = table->entries + index; - if (!entry->ptr) goto error; + if (!entry->ptr) return NULL; return entry; - - error: - set_error( STATUS_INVALID_HANDLE ); - return NULL; } /* attempt to shrink a table */ @@ -358,7 +354,11 @@ int close_handle( struct process *process, obj_handle_t handle ) struct handle_entry *entry; struct object *obj; - if (!(entry = get_handle( process, handle ))) return 0; + if (!(entry = get_handle( process, handle ))) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } if (entry->access & RESERVED_CLOSE_PROTECT) { set_error( STATUS_HANDLE_NOT_CLOSABLE ); @@ -402,7 +402,11 @@ struct object *get_handle_obj( struct process *process, obj_handle_t handle, if (!(obj = get_magic_handle( handle ))) { - if (!(entry = get_handle( process, handle ))) return NULL; + if (!(entry = get_handle( process, handle ))) + { + set_error( STATUS_INVALID_HANDLE ); + return NULL; + } if ((entry->access & access) != access) { set_error( STATUS_ACCESS_DENIED ); @@ -481,7 +485,11 @@ static int set_handle_flags( struct process *process, obj_handle_t handle, int m if (mask) set_error( STATUS_ACCESS_DENIED ); return 0; } - if (!(entry = get_handle( process, handle ))) return -1; + if (!(entry = get_handle( process, handle ))) + { + set_error( STATUS_INVALID_HANDLE ); + return -1; + } old_access = entry->access; mask = (mask << RESERVED_SHIFT) & RESERVED_ALL; flags = (flags << RESERVED_SHIFT) & mask; @@ -502,10 +510,7 @@ obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, str if ((entry = get_handle( src, src_handle ))) src_access = entry->access; else /* pseudo-handle, give it full access */ - { src_access = obj->ops->map_access( obj, GENERIC_ALL ); - clear_error(); - } src_access &= ~RESERVED_ALL; if (options & DUP_HANDLE_SAME_ACCESS)

1 0

Austin Lund : shell32/tests: Fix ITEMIDLIST_format test when running on FAT filesystems.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: 487a51b52f90d7674930013b0f4a6b4ce775766d URL: http://source.winehq.org/git/wine.git/?a=commit;h=487a51b52f90d7674930013b0… Author: Austin Lund <austin.lund(a)gmail.com> Date: Sat Nov 21 09:02:32 2009 +1000 shell32/tests: Fix ITEMIDLIST_format test when running on FAT filesystems. --- dlls/shell32/tests/shlfolder.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 831205a..caae425 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1525,9 +1525,26 @@ static void test_ITEMIDLIST_format(void) { pFileStructA->uFileTime == pFileStructW->uTime, "Last write time should match creation time!\n"); - ok (pFileStructA->uFileDate == pFileStructW->uDate2 && - pFileStructA->uFileTime == pFileStructW->uTime2, - "Last write time should match last access time!\n"); + /* On FAT filesystems the last access time is midnight + local time, so the values of uDate2 and uTime2 will + depend on the local timezone. If the times are exactly + equal then the dates should be identical for both FAT + and NTFS as no timezone is more than 1 day away from UTC. + */ + if (pFileStructA->uFileTime == pFileStructW->uTime2) + { + ok (pFileStructA->uFileDate == pFileStructW->uDate2, + "Last write date and time should match last access date and time!\n"); + } + else + { + /* Filesystem may be FAT. Check date within 1 day + and seconds are zero. */ + trace ("Filesystem may be FAT. Performing less strict atime test.\n"); + ok ((pFileStructW->uTime2 & 0x1F) == 0, + "Last access time on FAT filesystems should have zero seconds.\n"); + /* TODO: Perform check for date being within one day.*/ + } ok (!lstrcmpW(wszFile[i], pFileStructW->wszName) || !lstrcmpW(wszFile[i], (WCHAR *)(pFileStructW->abFooBar2 + 22)) || /* Vista */

1 0

Nikolay Sivov : comctl32/treeview: Simplify WM_CHAR handler.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: 1804941797c7c895d70a330dab88d345818051f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1804941797c7c895d70a330da… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Nov 30 22:18:59 2009 +0300 comctl32/treeview: Simplify WM_CHAR handler. --- dlls/comctl32/treeview.c | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index a7d71e4..d762a79 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4451,13 +4451,8 @@ TREEVIEW_SelectItem(TREEVIEW_INFO *infoPtr, INT wParam, HTREEITEM item) * * TREEVIEW_ProcessLetterKeys */ -static INT TREEVIEW_ProcessLetterKeys( - HWND hwnd, /* handle to the window */ - WPARAM charCode, /* the character code, the actual character */ - LPARAM keyData /* key data */ - ) +static INT TREEVIEW_ProcessLetterKeys(TREEVIEW_INFO *infoPtr, WPARAM charCode, LPARAM keyData) { - TREEVIEW_INFO *infoPtr; HTREEITEM nItem; HTREEITEM endidx,idx; TVITEMEXW item; @@ -4465,12 +4460,7 @@ static INT TREEVIEW_ProcessLetterKeys( DWORD timestamp,elapsed; /* simple parameter checking */ - if (!hwnd || !charCode || !keyData) - return 0; - - infoPtr=(TREEVIEW_INFO*)GetWindowLongPtrW(hwnd, 0); - if (!infoPtr) - return 0; + if (!charCode || !keyData) return 0; /* only allow the valid WM_CHARs through */ if (!isalnum(charCode) && @@ -5672,7 +5662,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TREEVIEW_SortChildrenCB(infoPtr, (LPTVSORTCB)lParam); case WM_CHAR: - return TREEVIEW_ProcessLetterKeys( hwnd, wParam, lParam ); + return TREEVIEW_ProcessLetterKeys(infoPtr, wParam, lParam); case WM_COMMAND: return TREEVIEW_Command(infoPtr, wParam, lParam);

1 0