December 2009 - Wine-commits

Henri Verbeet : ntdll/tests: Add some tests for FileAllInformation name information.
by Alexandre Julliard 01 Dec '09

01 Dec '09

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 : d3d8: Return D3DERR_INVALIDCALL when trying to delete an invalid pixel shader.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 212ee15bd7813fc71368e431e5a264cdc6d87e49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=212ee15bd7813fc71368e431e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 1 11:27:47 2009 +0100 d3d8: Return D3DERR_INVALIDCALL when trying to delete an invalid pixel shader. It appears this is fixed on Vista/Win7 to be consistent with DeleteVertexShader(). Match the more consistent behaviour of Vista/Win7 and mark the previous behaviour as broken. --- dlls/d3d8/device.c | 2 +- dlls/d3d8/tests/device.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 450a5ff..f390691 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2316,7 +2316,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(LPDIRECT3DDEVICE8 i { WARN("Invalid handle (%#x) passed.\n", pShader); wined3d_mutex_unlock(); - return D3D_OK; + return D3DERR_INVALIDCALL; } IWineD3DDevice_GetPixelShader(This->WineD3DDevice, &cur); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 900fbb7..5e1f523 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1084,9 +1084,9 @@ static void test_shader(void) /* Check for double delete. */ hr = IDirect3DDevice8_DeletePixelShader(pDevice, hPixelShader2); - ok(hr == D3D_OK, "IDirect3DDevice8_DeletePixelShader returned %#08x\n", hr); + ok(hr == D3DERR_INVALIDCALL || broken(hr == D3D_OK), "IDirect3DDevice8_DeletePixelShader returned %#08x\n", hr); hr = IDirect3DDevice8_DeletePixelShader(pDevice, hPixelShader); - ok(hr == D3D_OK, "IDirect3DDevice8_DeletePixelShader returned %#08x\n", hr); + ok(hr == D3DERR_INVALIDCALL || broken(hr == D3D_OK), "IDirect3DDevice8_DeletePixelShader returned %#08x\n", hr); } else {

1 0

Henri Verbeet : d3d9/tests: Trace the viewport in clear_test().
by Alexandre Julliard 01 Dec '09

01 Dec '09

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

Hans Leidekker : msi/tests: Don't check more bytes than written to the file .
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: fd8620f6c0aac1f89b217581d86f15134ea430d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8620f6c0aac1f89b217581d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 1 11:34:07 2009 +0100 msi/tests: Don't check more bytes than written to the file. --- dlls/msi/tests/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a007538..ee7e85b 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2849,7 +2849,7 @@ static void test_readonlyfile_cab(void) ReadFile(file, buf, sizeof(buf) - 1, &size, NULL); CloseHandle(file); } - ok( !lstrcmp( buf, "maximus" ), "Expected file to be overwritten, got '%s'\n", buf ); + ok(!memcmp( buf, "maximus", sizeof("maximus")-1 ), "Expected file to be overwritten, got '%s'\n", buf); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");

1 0

Hans Leidekker : wininet/tests: Trace extended errors in a couple of places .
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: c4d12bde2bb4ff7fa63346e7f2a5a5be1a3df889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d12bde2bb4ff7fa63346e7f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 1 11:35:11 2009 +0100 wininet/tests: Trace extended errors in a couple of places. --- dlls/wininet/tests/ftp.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index b4de4e1..d19b9a8 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -360,6 +360,20 @@ static void test_getfile(HINTERNET hFtp, HINTERNET hConnect) "Expected ERROR_INTERNET_INCORRECT_HANDLE_TYPE, got %d\n", GetLastError()); } +static void trace_extended_error(DWORD error) +{ + DWORD code, buflen = 0; + + if (error != ERROR_INTERNET_EXTENDED_ERROR) return; + if (!InternetGetLastResponseInfoA(&code, NULL, &buflen) && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + char *text = HeapAlloc(GetProcessHeap(), 0, ++buflen); + InternetGetLastResponseInfoA(&code, text, &buflen); + trace("%u %s\n", code, text); + HeapFree(GetProcessHeap(), 0, text); + } +} + static void test_openfile(HINTERNET hFtp, HINTERNET hConnect) { HINTERNET hOpenFile; @@ -414,21 +428,26 @@ static void test_openfile(HINTERNET hFtp, HINTERNET hConnect) if (hOpenFile) { BOOL bRet; + DWORD error; HINTERNET hOpenFile2; HANDLE hFile; /* We have a handle so all ftp calls should fail (TODO: Put all ftp-calls in here) */ SetLastError(0xdeadbeef); bRet = FtpCreateDirectoryA(hFtp, "new_directory_deadbeef"); + error = GetLastError(); ok ( bRet == FALSE, "Expected FtpCreateDirectoryA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS, + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); + trace_extended_error(error); SetLastError(0xdeadbeef); bRet = FtpDeleteFileA(hFtp, "non_existent_file_deadbeef"); + error = GetLastError(); ok ( bRet == FALSE, "Expected FtpDeleteFileA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS, + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); + trace_extended_error(error); SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0);

1 0

Hans Leidekker : advapi32: Improve the stub for GetEffectiveRightsFromAclA.
by Alexandre Julliard 01 Dec '09

01 Dec '09

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

Austin Lund : shell32/tests: Fix ITEMIDLIST_format test when running on FAT filesystems.
by Alexandre Julliard 01 Dec '09

01 Dec '09

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

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

01 Dec '09

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

Alexandre Julliard : server: Don't set last error in close_handle(), return the error code instead.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 60efdd55eaf73bf556dc9ab97745780f911da3f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60efdd55eaf73bf556dc9ab97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 13:59:41 2009 +0100 server: Don't set last error in close_handle(), return the error code instead. --- server/handle.c | 33 ++++++++------------------------- server/handle.h | 2 +- server/winstation.c | 5 ++--- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/server/handle.c b/server/handle.c index d1b6a14..3baaa6d 100644 --- a/server/handle.c +++ b/server/handle.c @@ -347,35 +347,22 @@ struct handle_table *copy_handle_table( struct process *process, struct process } /* close a handle and decrement the refcount of the associated object */ -/* return 1 if OK, 0 on error */ -int close_handle( struct process *process, obj_handle_t handle ) +unsigned int close_handle( struct process *process, obj_handle_t handle ) { struct handle_table *table; struct handle_entry *entry; struct object *obj; - 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 ); - return 0; - } + if (!(entry = get_handle( process, handle ))) return STATUS_INVALID_HANDLE; + if (entry->access & RESERVED_CLOSE_PROTECT) return STATUS_HANDLE_NOT_CLOSABLE; obj = entry->ptr; - if (!obj->ops->close_handle( obj, process, handle )) - { - set_error( STATUS_HANDLE_NOT_CLOSABLE ); - return 0; - } + if (!obj->ops->close_handle( obj, process, handle )) return STATUS_HANDLE_NOT_CLOSABLE; entry->ptr = NULL; table = handle_is_global(handle) ? global_table : process->handles; if (entry < table->entries + table->free) table->free = entry - table->entries; if (entry == table->entries + table->last) shrink_handle_table( table ); release_object( obj ); - return 1; + return STATUS_SUCCESS; } /* retrieve the object corresponding to one of the magic pseudo-handles */ @@ -567,7 +554,8 @@ unsigned int get_handle_table_count( struct process *process ) /* close a handle */ DECL_HANDLER(close_handle) { - close_handle( current->process, req->handle ); + unsigned int err = close_handle( current->process, req->handle ); + set_error( err ); } /* set a handle information */ @@ -596,12 +584,7 @@ DECL_HANDLER(dup_handle) release_object( dst ); } /* close the handle no matter what happened */ - if (req->options & DUP_HANDLE_CLOSE_SOURCE) - { - unsigned int err = get_error(); /* don't overwrite error from the above calls */ - reply->closed = close_handle( src, req->src_handle ); - set_error( err ); - } + if (req->options & DUP_HANDLE_CLOSE_SOURCE) reply->closed = !close_handle( src, req->src_handle ); reply->self = (src == current->process); release_object( src ); } diff --git a/server/handle.h b/server/handle.h index 3809aa3..7860f52 100644 --- a/server/handle.h +++ b/server/handle.h @@ -38,7 +38,7 @@ extern obj_handle_t alloc_handle( struct process *process, void *obj, unsigned int access, unsigned int attr ); extern obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, unsigned int access, unsigned int attr ); -extern int close_handle( struct process *process, obj_handle_t handle ); +extern unsigned int close_handle( struct process *process, obj_handle_t handle ); extern struct object *get_handle_obj( struct process *process, obj_handle_t handle, unsigned int access, const struct object_ops *ops ); extern unsigned int get_handle_access( struct process *process, obj_handle_t handle ); diff --git a/server/winstation.c b/server/winstation.c index cfff0a4..7ddc277 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -403,7 +403,6 @@ void close_thread_desktop( struct thread *thread ) thread->desktop = 0; if (handle) close_handle( thread->process, handle ); - clear_error(); /* ignore errors */ } /* set the reply data from the object name */ @@ -458,7 +457,7 @@ DECL_HANDLER(close_winstation) if ((winstation = (struct winstation *)get_handle_obj( current->process, req->handle, 0, &winstation_ops ))) { - if (!close_handle( current->process, req->handle )) set_error( STATUS_ACCESS_DENIED ); + if (close_handle( current->process, req->handle )) set_error( STATUS_ACCESS_DENIED ); release_object( winstation ); } } @@ -544,7 +543,7 @@ DECL_HANDLER(close_desktop) if ((desktop = (struct desktop *)get_handle_obj( current->process, req->handle, 0, &desktop_ops ))) { - if (!close_handle( current->process, req->handle )) set_error( STATUS_DEVICE_BUSY ); + if (close_handle( current->process, req->handle )) set_error( STATUS_DEVICE_BUSY ); release_object( desktop ); } }

1 0

Michael Stefaniuc : comctl32: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 4376ccf3fc403ca9801e3f102d928c81ce63b55a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4376ccf3fc403ca9801e3f102… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 30 23:45:16 2009 +0100 comctl32: Use FAILED instead of !SUCCEEDED. --- dlls/comctl32/imagelist.c | 8 ++++---- dlls/comctl32/tests/imagelist.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 9f310c3..53a558f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -598,7 +598,7 @@ ImageList_Create (INT cx, INT cy, UINT flags, TRACE("(%d %d 0x%x %d %d)\n", cx, cy, flags, cInitial, cGrow); /* Create the IImageList interface for the image list */ - if (!SUCCEEDED(ImageListImpl_CreateInstance(NULL, &IID_IImageList, (void **) &himl))) + if (FAILED(ImageListImpl_CreateInstance(NULL, &IID_IImageList, (void **)&himl))) return NULL; cGrow = (cGrow < 4) ? 4 : (cGrow + 3) & ~3; @@ -3101,7 +3101,7 @@ static HRESULT WINAPI ImageListImpl_Copy(IImageList *iface, int iDst, return E_FAIL; /* TODO: Add test for IID_ImageList2 too */ - if (!SUCCEEDED(IImageList_QueryInterface(punkSrc, &IID_IImageList, + if (FAILED(IImageList_QueryInterface(punkSrc, &IID_IImageList, (void **) &src))) return E_FAIL; @@ -3126,7 +3126,7 @@ static HRESULT WINAPI ImageListImpl_Merge(IImageList *iface, int i1, return E_FAIL; /* TODO: Add test for IID_ImageList2 too */ - if (!SUCCEEDED(IImageList_QueryInterface(punk2, &IID_IImageList, + if (FAILED(IImageList_QueryInterface(punk2, &IID_IImageList, (void **) &iml2))) return E_FAIL; @@ -3260,7 +3260,7 @@ static HRESULT WINAPI ImageListImpl_SetDragCursorImage(IImageList *iface, return E_FAIL; /* TODO: Add test for IID_ImageList2 too */ - if (!SUCCEEDED(IImageList_QueryInterface(punk, &IID_IImageList, + if (FAILED(IImageList_QueryInterface(punk, &IID_IImageList, (void **) &iml2))) return E_FAIL; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index e06b974..5290788 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1424,7 +1424,7 @@ static void DoTest1_v6(void) ok(SUCCEEDED(IImageList_ReplaceIcon(imgl, -1, hicon3, &ret)) && (ret == 2),"failed to add icon3\n"); /* remove an index out of range */ - ok(!SUCCEEDED(IImageList_Remove(imgl,4711)),"removed nonexistent icon\n"); + ok(FAILED(IImageList_Remove(imgl, 4711)),"removed nonexistent icon\n"); /* remove three */ ok(SUCCEEDED(IImageList_Remove(imgl,0)),"can't remove 0\n"); @@ -1432,7 +1432,7 @@ static void DoTest1_v6(void) ok(SUCCEEDED(IImageList_Remove(imgl,0)),"can't remove 0\n"); /* remove one extra */ - ok(!SUCCEEDED(IImageList_Remove(imgl,0)),"removed nonexistent icon\n"); + ok(FAILED(IImageList_Remove(imgl, 0)),"removed nonexistent icon\n"); /* check SetImageCount/GetImageCount */ ok(SUCCEEDED(IImageList_SetImageCount(imgl, 3)), "couldn't increase image count\n");

1 0