December 2006 - Wine-Commits

Tomas Carnecky : winex11.drv: Don' t update the key state table in mouse related functions.
by Alexandre Julliard Dec. 1, 2006

Dec. 1, 2006

Module: wine Branch: master Commit: 9d1686c8c5a6a5f16000e70c78048ef0da8e9edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d1686c8c5a6a5f16000e70c7… Author: Tomas Carnecky <tom(a)dbservice.com> Date: Fri Dec 1 00:27:31 2006 +0000 winex11.drv: Don't update the key state table in mouse related functions. --- dlls/winex11.drv/mouse.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index abb8306..5067acd 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -102,18 +102,6 @@ static inline void update_button_state( /*********************************************************************** - * update_key_state - * - * Update the key state with what X provides us - */ -static inline void update_key_state( unsigned int state ) -{ - key_state_table[VK_SHIFT] = (state & ShiftMask ? 0x80 : 0); - key_state_table[VK_CONTROL] = (state & ControlMask ? 0x80 : 0); -} - - -/*********************************************************************** * update_mouse_state * * Update the various window states on a mouse event. @@ -128,7 +116,6 @@ static void update_mouse_state( HWND hwn y += virtual_screen_rect.top; } get_coords( hwnd, x, y, pt ); - update_key_state( state ); /* update the cursor */ @@ -718,7 +705,6 @@ BOOL X11DRV_GetCursorPos(LPPOINT pos) if (XQueryPointer( display, root_window, &root, &child, &rootX, &rootY, &winX, &winY, &xstate )) { - update_key_state( xstate ); update_button_state( xstate ); winX += virtual_screen_rect.left; winY += virtual_screen_rect.top;

1 0

Markus Amsler : d3d9: Remove unreachable return.
by Alexandre Julliard Dec. 1, 2006

Dec. 1, 2006

Module: wine Branch: master Commit: dc0afe42427f56830eda43c1b7b8c5d3e79aa2f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0afe42427f56830eda43c1b… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Fri Dec 1 01:37:34 2006 +0100 d3d9: Remove unreachable return. --- dlls/d3d9/device.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 094f79f..168144e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -813,7 +813,6 @@ static HRESULT WINAPI IDirect3DDevice9 IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n" , This); return IWineD3DDevice_GetStreamSourceFreq(This->WineD3DDevice, StreamNumber, Divider); - return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetIndices(LPDIRECT3DDEVICE9 iface, IDirect3DIndexBuffer9* pIndexData) {

1 0

James Hawkins : msi: Set the UserSID property.
by Alexandre Julliard Dec. 1, 2006

Dec. 1, 2006

Module: wine Branch: master Commit: 8ae81d0620a0c11febea41fdfd463f692e506dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ae81d0620a0c11febea41fdf… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Nov 30 18:15:40 2006 -0800 msi: Set the UserSID property. --- dlls/msi/package.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 57bf0f6..d4b9d25 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -41,6 +41,7 @@ #include "wine/unicode.h" #include "objbase.h" #include "msidefs.h" +#include "sddl.h" #include "msipriv.h" @@ -113,6 +114,56 @@ static UINT set_installed_prop( MSIPACKA return r; } +static UINT set_user_sid_prop( MSIPACKAGE *package ) +{ + SID_NAME_USE use; + LPWSTR user_name; + LPWSTR sid_str, dom = NULL; + DWORD size, dom_size; + PSID psid = NULL; + UINT r = ERROR_FUNCTION_FAILED; + + static const WCHAR user_sid[] = {'U','s','e','r','S','I','D',0}; + + size = 0; + GetUserNameW( NULL, &size ); + + user_name = msi_alloc( (size + 1) * sizeof(WCHAR) ); + if (!user_name) + return ERROR_OUTOFMEMORY; + + if (!GetUserNameW( user_name, &size )) + goto done; + + size = 0; + dom_size = 0; + LookupAccountNameW( NULL, user_name, NULL, &size, NULL, &dom_size, &use ); + + psid = msi_alloc( size ); + dom = msi_alloc( dom_size ); + if (!psid || !dom) + { + r = ERROR_OUTOFMEMORY; + goto done; + } + + if (!LookupAccountNameW( NULL, user_name, psid, &size, dom, &dom_size, &use )) + goto done; + + if (!ConvertSidToStringSidW( psid, &sid_str )) + goto done; + + r = MSI_SetPropertyW( package, user_sid, sid_str ); + +done: + LocalFree( sid_str ); + msi_free( dom ); + msi_free( psid ); + msi_free( user_name ); + + return r; +} + /* * There are a whole slew of these we need to set * @@ -379,6 +430,9 @@ static VOID set_installer_properties(MSI msi_free( company ); } + if ( set_user_sid_prop( package ) != ERROR_SUCCESS) + ERR("Failed to set the UserSID property\n"); + msi_free( check ); CloseHandle( hkey ); }

1 0

James Hawkins : advapi32: Add tests for LookupAccountName.
by Alexandre Julliard Dec. 1, 2006

Dec. 1, 2006

Module: wine Branch: master Commit: 19a49eb51afbe860ca2614c58589f6f915124ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a49eb51afbe860ca2614c58… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Nov 30 15:53:21 2006 -0800 advapi32: Add tests for LookupAccountName. --- dlls/advapi32/tests/security.c | 148 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 148 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6419864..b651364 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -30,6 +30,7 @@ #include "winnt.h" #include "sddl.h" #include "ntsecapi.h" +#include "lmcons.h" #include "wine/test.h" @@ -1164,6 +1165,152 @@ static void test_LookupAccountSid(void) } } +static void get_sid_info(PSID psid, LPSTR *user, LPSTR *dom) +{ + static CHAR account[UNLEN + 1]; + static CHAR domain[UNLEN + 1]; + DWORD size, dom_size; + SID_NAME_USE use; + + *user = account; + *dom = domain; + + size = dom_size = UNLEN + 1; + account[0] = '\0'; + domain[0] = '\0'; + LookupAccountSidA(NULL, psid, account, &size, domain, &dom_size, &use); +} + +static void test_LookupAccountName(void) +{ + DWORD sid_size, domain_size, user_size; + DWORD sid_save, domain_save; + CHAR user_name[UNLEN + 1]; + SID_NAME_USE sid_use; + LPSTR domain, account, sid_dom; + PSID psid; + BOOL ret; + + /* native crashes if (assuming all other parameters correct): + * - peUse is NULL + * - Sid is NULL and cbSid is > 0 + * - cbSid or cchReferencedDomainName are NULL + * - ReferencedDomainName is NULL and cchReferencedDomainName is the correct size + */ + + user_size = UNLEN + 1; + ret = GetUserNameA(user_name, &user_size); + ok(ret, "Failed to get user name\n"); + + /* get sizes */ + sid_size = 0; + domain_size = 0; + sid_use = 0xcafebabe; + SetLastError(0xdeadbeef); + ret = LookupAccountNameA(NULL, user_name, NULL, &sid_size, NULL, &domain_size, &sid_use); + ok(!ret, "Expected 0, got %d\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(sid_size != 0, "Expected non-zero sid size\n"); + ok(domain_size != 0, "Expected non-zero domain size\n"); + ok(sid_use == 0xcafebabe, "Expected 0xcafebabe, got %d\n", sid_use); + + sid_save = sid_size; + domain_save = domain_size; + + psid = HeapAlloc(GetProcessHeap(), 0, sid_size); + domain = HeapAlloc(GetProcessHeap(), 0, domain_size); + + /* try valid account name */ + ret = LookupAccountNameA(NULL, user_name, psid, &sid_size, domain, &domain_size, &sid_use); + get_sid_info(psid, &account, &sid_dom); + ok(ret, "Failed to lookup account name\n"); + ok(sid_size == GetLengthSid(psid), "Expected %d, got %d\n", GetLengthSid(psid), sid_size); + todo_wine + { + ok(!lstrcmp(account, user_name), "Expected %s, got %s\n", user_name, account); + ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); + ok(domain_size == domain_save - 1, "Expected %d, got %d\n", domain_save - 1, domain_size); + ok(lstrlen(domain) == domain_size, "Expected %d\n", lstrlen(domain)); + ok(sid_use == SidTypeUser, "Expected SidTypeUser, got %d\n", SidTypeUser); + } + domain_size = domain_save; + + /* NULL Sid with zero sid size */ + SetLastError(0xdeadbeef); + sid_size = 0; + ret = LookupAccountNameA(NULL, user_name, NULL, &sid_size, domain, &domain_size, &sid_use); + ok(!ret, "Expected 0, got %d\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(sid_size == sid_save, "Expected %d, got %d\n", sid_save, sid_size); + ok(domain_size == domain_save, "Expected %d, got %d\n", domain_save, domain_size); + + /* try cchReferencedDomainName - 1 */ + SetLastError(0xdeadbeef); + domain_size--; + ret = LookupAccountNameA(NULL, user_name, NULL, &sid_size, domain, &domain_size, &sid_use); + ok(!ret, "Expected 0, got %d\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(sid_size == sid_save, "Expected %d, got %d\n", sid_save, sid_size); + ok(domain_size == domain_save, "Expected %d, got %d\n", domain_save, domain_size); + + /* NULL ReferencedDomainName with zero domain name size */ + SetLastError(0xdeadbeef); + domain_size = 0; + ret = LookupAccountNameA(NULL, user_name, psid, &sid_size, NULL, &domain_size, &sid_use); + ok(!ret, "Expected 0, got %d\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(sid_size == sid_save, "Expected %d, got %d\n", sid_save, sid_size); + ok(domain_size == domain_save, "Expected %d, got %d\n", domain_save, domain_size); + + HeapFree(GetProcessHeap(), 0, psid); + HeapFree(GetProcessHeap(), 0, domain); + + /* get sizes for NULL account name */ + sid_size = 0; + domain_size = 0; + sid_use = 0xcafebabe; + SetLastError(0xdeadbeef); + ret = LookupAccountNameA(NULL, NULL, NULL, &sid_size, NULL, &domain_size, &sid_use); + ok(!ret, "Expected 0, got %d\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(sid_size != 0, "Expected non-zero sid size\n"); + ok(domain_size != 0, "Expected non-zero domain size\n"); + ok(sid_use == 0xcafebabe, "Expected 0xcafebabe, got %d\n", sid_use); + + psid = HeapAlloc(GetProcessHeap(), 0, sid_size); + domain = HeapAlloc(GetProcessHeap(), 0, domain_size); + + /* try NULL account name */ + ret = LookupAccountNameA(NULL, NULL, psid, &sid_size, domain, &domain_size, &sid_use); + get_sid_info(psid, &account, &sid_dom); + ok(ret, "Failed to lookup account name\n"); + todo_wine + { + ok(!lstrcmp(account, "BUILTIN"), "Expected BUILTIN, got %s\n", account); + ok(!lstrcmp(domain, "BUILTIN"), "Expected BUILTIN, got %s\n", domain); + ok(sid_use == SidTypeDomain, "Expected SidTypeDomain, got %d\n", SidTypeDomain); + } + + /* try an invalid account name */ + SetLastError(0xdeadbeef); + sid_size = 0; + domain_size = 0; + ret = LookupAccountNameA(NULL, "oogabooga", NULL, &sid_size, NULL, &domain_size, &sid_use); + ok(!ret, "Expected 0, got %d\n", ret); + todo_wine + { + ok(GetLastError() == ERROR_NONE_MAPPED, + "Expected ERROR_NONE_MAPPED, got %d\n", GetLastError()); + ok(sid_size == 0, "Expected 0, got %d\n", sid_size); + ok(domain_size == 0, "Expected 0, got %d\n", domain_size); + } +} + START_TEST(security) { init(); @@ -1175,4 +1322,5 @@ START_TEST(security) test_AccessCheck(); test_token_attr(); test_LookupAccountSid(); + test_LookupAccountName(); }

1 0

Detlef Riekenberg : comctl32: Do not crash when the startpage is invalid.
by Alexandre Julliard Dec. 1, 2006

Dec. 1, 2006

Module: wine Branch: master Commit: e089659af1dfba75fd146e5890351b256992c25e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e089659af1dfba75fd146e589… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Dec 1 00:50:31 2006 +0100 comctl32: Do not crash when the startpage is invalid. --- dlls/comctl32/propsheet.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 7261d19..8490d74 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2824,6 +2824,9 @@ INT_PTR WINAPI PropertySheetA(LPCPROPSHE } } + if (psInfo->active_page >= psInfo->nPages) psInfo->active_page = 0; + TRACE("startpage: %d of %d pages\n", psInfo->active_page, psInfo->nPages); + psInfo->unicode = FALSE; psInfo->ended = FALSE; @@ -2875,6 +2878,9 @@ INT_PTR WINAPI PropertySheetW(LPCPROPSHE } } + if (psInfo->active_page >= psInfo->nPages) psInfo->active_page = 0; + TRACE("startpage: %d of %d pages\n", psInfo->active_page, psInfo->nPages); + psInfo->unicode = TRUE; psInfo->ended = FALSE;

1 0

Alexandre Julliard : kernel32/tests: Added test case for . and .. directory entries.
by Alexandre Julliard Dec. 1, 2006

Dec. 1, 2006

Module: wine Branch: master Commit: 7cd9400b806e4505bc109f1003b3f5c99d766393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd9400b806e4505bc109f100… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 1 13:11:53 2006 +0100 kernel32/tests: Added test case for . and .. directory entries. --- dlls/kernel32/tests/file.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index d9677fc..5b86d3c 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1205,6 +1205,24 @@ static void test_FindFirstFileA(void) strcat(buffer2, "*"); handle = FindFirstFileA(buffer2, &data); ok ( handle != INVALID_HANDLE_VALUE, "FindFirstFile on %s should succeed\n", buffer2 ); + ok ( strcmp( data.cFileName, "." ) && strcmp( data.cFileName, ".." ), + "FindFirstFile shouldn't return '%s' in drive root\n", data.cFileName ); + if (FindNextFileA( handle, &data )) + ok ( strcmp( data.cFileName, "." ) && strcmp( data.cFileName, ".." ), + "FindNextFile shouldn't return '%s' in drive root\n", data.cFileName ); + ok ( FindClose(handle) == TRUE, "Failed to close handle %s\n", buffer2 ); + + /* try FindFirstFileA on windows dir */ + GetWindowsDirectory( buffer2, sizeof(buffer2) ); + strcat(buffer2, "\\*"); + handle = FindFirstFileA(buffer2, &data); + ok( handle != INVALID_HANDLE_VALUE, "FindFirstFile on %s should succeed\n", buffer2 ); + ok( !strcmp( data.cFileName, "." ), "FindFirstFile should return '.' first\n" ); + ok( FindNextFileA( handle, &data ), "FindNextFile failed\n" ); + ok( !strcmp( data.cFileName, ".." ), "FindNextFile should return '..' as second entry\n" ); + while (FindNextFileA( handle, &data )) + ok ( strcmp( data.cFileName, "." ) && strcmp( data.cFileName, ".." ), + "FindNextFile shouldn't return '%s'\n", data.cFileName ); ok ( FindClose(handle) == TRUE, "Failed to close handle %s\n", buffer2 ); /* try FindFirstFileA on "C:\foo\" */

1 0

Alexandre Julliard : ntdll: Always return . and .. as the first two entries in directory searches.
by Alexandre Julliard Dec. 1, 2006

Dec. 1, 2006

Module: wine Branch: master Commit: df29fd3ab322b30cfd60a1c8f56ceb72ef4ae57c URL: http://source.winehq.org/git/wine.git/?a=commit;h=df29fd3ab322b30cfd60a1c8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 1 13:11:38 2006 +0100 ntdll: Always return . and .. as the first two entries in directory searches. --- dlls/kernel32/file.c | 38 ++++++++++----- dlls/ntdll/directory.c | 122 ++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 134 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index d0b28d0..5a0c5cb 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1677,20 +1677,34 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR CloseHandle( info->handle ); info->handle = 0; } - else if (!FindNextFileW( (HANDLE)info, data )) - { - TRACE( "%s not found\n", debugstr_w(filename) ); - FindClose( (HANDLE)info ); - SetLastError( ERROR_FILE_NOT_FOUND ); - return INVALID_HANDLE_VALUE; - } - else if (!strpbrkW( info->mask.Buffer, wildcardsW )) + else { - /* we can't find two files with the same name */ - CloseHandle( info->handle ); - info->handle = 0; + IO_STATUS_BLOCK io; + + NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, sizeof(info->data), + FileBothDirectoryInformation, FALSE, &info->mask, TRUE ); + if (io.u.Status) + { + FindClose( info ); + SetLastError( RtlNtStatusToDosError( io.u.Status ) ); + return INVALID_HANDLE_VALUE; + } + info->data_len = io.Information; + if (!FindNextFileW( info, data )) + { + TRACE( "%s not found\n", debugstr_w(filename) ); + FindClose( info ); + SetLastError( ERROR_FILE_NOT_FOUND ); + return INVALID_HANDLE_VALUE; + } + if (!strpbrkW( info->mask.Buffer, wildcardsW )) + { + /* we can't find two files with the same name */ + CloseHandle( info->handle ); + info->handle = 0; + } } - return (HANDLE)info; + return info; error: HeapFree( GetProcessHeap(), 0, info ); diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 37d2d4c..3786b91 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -107,7 +107,7 @@ typedef struct char d_name[256]; } KERNEL_DIRENT64; -static inline int getdents64( int fd, KERNEL_DIRENT64 *de, unsigned int size ) +static inline int getdents64( int fd, char *de, unsigned int size ) { int ret; __asm__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" @@ -1060,15 +1060,15 @@ static int read_directory_getdents( int { off_t old_pos = 0; size_t size = length; - int res; - char local_buffer[8192]; - KERNEL_DIRENT64 *data, *de; + int res, fake_dot_dot = 1; + char *data, local_buffer[8192]; + KERNEL_DIRENT64 *de; FILE_BOTH_DIR_INFORMATION *info, *last_info = NULL; if (size <= sizeof(local_buffer) || !(data = RtlAllocateHeap( GetProcessHeap(), 0, size ))) { size = sizeof(local_buffer); - data = (KERNEL_DIRENT64 *)local_buffer; + data = local_buffer; } if (restart_scan) lseek( fd, 0, SEEK_SET ); @@ -1096,13 +1096,52 @@ static int read_directory_getdents( int goto done; } - de = data; + de = (KERNEL_DIRENT64 *)data; + + if (restart_scan) + { + /* check if we got . and .. from getdents */ + if (res > 0) + { + if (!strcmp( de->d_name, "." ) && res > de->d_reclen) + { + KERNEL_DIRENT64 *next_de = (KERNEL_DIRENT64 *)(data + de->d_reclen); + if (!strcmp( next_de->d_name, ".." )) fake_dot_dot = 0; + } + } + /* make sure we have enough room for both entries */ + if (fake_dot_dot) + { + static const ULONG min_info_size = (FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName[1]) + + FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName[2]) + 3) & ~3; + if (length < min_info_size || single_entry) + { + FIXME( "not enough room %u/%u for fake . and .. entries\n", length, single_entry ); + fake_dot_dot = 0; + } + } + + if (fake_dot_dot) + { + if ((info = append_entry( buffer, &io->Information, length, ".", NULL, mask ))) + last_info = info; + if ((info = append_entry( buffer, &io->Information, length, "..", NULL, mask ))) + last_info = info; + + /* check if we still have enough space for the largest possible entry */ + if (last_info && io->Information + max_dir_info_size > length) + { + lseek( fd, 0, SEEK_SET ); /* reset pos to first entry */ + res = 0; + } + } + } while (res > 0) { res -= de->d_reclen; - info = append_entry( buffer, &io->Information, length, de->d_name, NULL, mask ); - if (info) + if (!(fake_dot_dot && (!strcmp( de->d_name, "." ) || !strcmp( de->d_name, ".." ))) && + (info = append_entry( buffer, &io->Information, length, de->d_name, NULL, mask ))) { last_info = info; if ((char *)info->FileName + info->FileNameLength > (char *)buffer + length) @@ -1124,7 +1163,7 @@ static int read_directory_getdents( int else { res = getdents64( fd, data, size ); - de = data; + de = (KERNEL_DIRENT64 *)data; } } @@ -1132,7 +1171,7 @@ static int read_directory_getdents( int else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; res = 0; done: - if ((char *)data != local_buffer) RtlFreeHeap( GetProcessHeap(), 0, data ); + if (data != local_buffer) RtlFreeHeap( GetProcessHeap(), 0, data ); return res; } @@ -1150,7 +1189,7 @@ static int read_directory_getdirentries( long restart_pos; ULONG_PTR restart_info_pos = 0; size_t size, initial_size = length; - int res; + 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; @@ -1178,10 +1217,53 @@ static int read_directory_getdirentries( de = (struct dirent *)data; + if (restart_scan) + { + /* check if we got . and .. from getdirentries */ + if (res > 0) + { + if (!strcmp( de->d_name, "." ) && res > de->d_reclen) + { + struct dirent *next_de = (struct dirent *)(data + de->d_reclen); + if (!strcmp( next_de->d_name, ".." )) fake_dot_dot = 0; + } + } + /* make sure we have enough room for both entries */ + if (fake_dot_dot) + { + static const ULONG min_info_size = (FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName[1]) + + FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName[2]) + 3) & ~3; + if (length < min_info_size || single_entry) + { + FIXME( "not enough room %u/%u for fake . and .. entries\n", length, single_entry ); + fake_dot_dot = 0; + } + } + + if (fake_dot_dot) + { + if ((info = append_entry( buffer, &io->Information, length, ".", NULL, mask ))) + last_info = info; + if ((info = append_entry( buffer, &io->Information, length, "..", NULL, mask ))) + last_info = info; + + restart_last_info = last_info; + restart_info_pos = io->Information; + + /* check if we still have enough space for the largest possible entry */ + if (last_info && io->Information + max_dir_info_size > length) + { + lseek( fd, 0, SEEK_SET ); /* reset pos to first entry */ + res = 0; + } + } + } + while (res > 0) { res -= de->d_reclen; if (de->d_fileno && + !(fake_dot_dot && (!strcmp( de->d_name, "." ) || !strcmp( de->d_name, ".." ))) && ((info = append_entry( buffer, &io->Information, length, de->d_name, NULL, mask )))) { last_info = info; @@ -1266,7 +1348,7 @@ static void read_directory_readdir( int { old_pos = lseek( fd, 0, SEEK_CUR ); /* skip the right number of entries */ - for (i = 0; i < old_pos; i++) + for (i = 0; i < old_pos - 2; i++) { if (!readdir( dir )) { @@ -1278,10 +1360,22 @@ static void read_directory_readdir( int } io->u.Status = STATUS_SUCCESS; - while ((de = readdir( dir ))) + for (;;) { + if (old_pos == 0) + info = append_entry( buffer, &io->Information, length, ".", NULL, mask ); + else if (old_pos == 1) + info = append_entry( buffer, &io->Information, length, "..", NULL, mask ); + else if ((de = readdir( dir ))) + { + if (strcmp( de->d_name, "." ) && strcmp( de->d_name, ".." )) + info = append_entry( buffer, &io->Information, length, de->d_name, NULL, mask ); + else + info = NULL; + } + else + break; old_pos++; - info = append_entry( buffer, &io->Information, length, de->d_name, NULL, mask ); if (info) { last_info = info;

1 0

Dmitry Timoshkov : kernel32: Skip the PE loader test under a Win9x platform .
by Alexandre Julliard Dec. 1, 2006

Dec. 1, 2006

Module: wine Branch: master Commit: a411b85868fa133735312d9125df65cfd1c86905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a411b85868fa133735312d912… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Dec 1 18:09:56 2006 +0800 kernel32: Skip the PE loader test under a Win9x platform. --- dlls/kernel32/tests/loader.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 7a0bb98..50dbfb8 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -321,7 +321,7 @@ todo_wine { ok(FreeLibrary(hlib), "FreeLibrary error %d\n", GetLastError()); } else - { + { /* LoadLibrary has failed */ if (hlib) /* remove completely once Wine is fixed */ { todo_wine ok(!hlib, "%d: LoadLibrary should fail\n", i); @@ -332,6 +332,13 @@ todo_wine { ok(!hlib, "%d: LoadLibrary should fail\n", i); + if (GetLastError() == ERROR_GEN_FAILURE) /* Win9x, broken behaviour */ + { + trace("skipping the loader test on Win9x\n"); + DeleteFile(dll_name); + return; + } + ok(td[i].error == GetLastError(), "%d: expected error %d, got %d\n", i, td[i].error, GetLastError()); }

1 0

Peter Beutner : ntdll: Add more exception tests.
by Alexandre Julliard Dec. 1, 2006

Dec. 1, 2006

Module: wine Branch: master Commit: 6c9af2bdcb334a9d7f33bcd8d1f410ba728eedd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c9af2bdcb334a9d7f33bcd8d… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Thu Nov 30 17:54:05 2006 +0100 ntdll: Add more exception tests. --- dlls/ntdll/tests/exception.c | 95 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 92 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index fad46ca..ec86579 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -38,6 +38,7 @@ static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static NTSTATUS (WINAPI *pNtGetContextThread)(HANDLE,CONTEXT*); +static NTSTATUS (WINAPI *pNtSetContextThread)(HANDLE,CONTEXT*); static void *code_mem; /* Test various instruction combinations that cause a protection fault on the i386, @@ -258,6 +259,16 @@ static DWORD single_step_handler( EXCEPT { got_exception++; ok (!(context->EFlags & 0x100), "eflags has single stepping bit set\n"); + + if( got_exception < 3) + context->EFlags |= 0x100; /* single step until popf instruction */ + else { + /* show that the last single step exception on the popf instruction + * (which removed the TF bit), still is a EXCEPTION_SINGLE_STEP exception */ + todo_wine { ok( rec->ExceptionCode == EXCEPTION_SINGLE_STEP, + "exception is not EXCEPTION_SINGLE_STEP: %x\n", rec->ExceptionCode); }; + } + return ExceptionContinueExecution; } @@ -301,15 +312,78 @@ static DWORD align_check_handler( EXCEPT return ExceptionContinueExecution; } +/* test single stepping over hardware breakpoint */ +static DWORD bpx_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +{ + got_exception++; + ok( rec->ExceptionCode == EXCEPTION_SINGLE_STEP, + "wrong exception code: %x\n", rec->ExceptionCode); + + if(got_exception == 1) { + /* hw bp exception on first nop */ + ok( context->Eip == (DWORD)code_mem, "eip is wrong: %x instead of %x\n", + context->Eip, (DWORD)code_mem); + ok( (context->Dr6 & 0xf) == 1, "B0 flag is not set in Dr6\n"); + ok( !(context->Dr6 & 0x4000), "BS flag is set in Dr6\n"); + context->Dr0 = context->Dr0 + 1; /* set hw bp again on next instruction */ + context->EFlags |= 0x100; /* enable single stepping */ + } else if( got_exception == 2) { + /* single step exception on second nop */ + ok( context->Eip == (DWORD)code_mem + 1, "eip is wrong: %x instead of %x\n", + context->Eip, (DWORD)code_mem + 1); + todo_wine{ ok( (context->Dr6 & 0x4000), "BS flag is not set in Dr6\n"); }; + ok( (context->Dr6 & 0xf) == 0, "B0...3 flags in Dr6 shouldn't be set\n"); + context->EFlags |= 0x100; + } else if( got_exception == 3) { + /* hw bp exception on second nop */ + ok( context->Eip == (DWORD)code_mem + 1, "eip is wrong: %x instead of %x\n", + context->Eip, (DWORD)code_mem + 1); + todo_wine{ ok( (context->Dr6 & 0xf) == 1, "B0 flag is not set in Dr6\n"); }; + ok( !(context->Dr6 & 0x4000), "BS flag is set in Dr6\n"); + context->Dr0 = 0; /* clear breakpoint */ + context->EFlags |= 0x100; + } else { + /* single step exception on ret */ + ok( context->Eip == (DWORD)code_mem + 2, "eip is wrong: %x instead of %x\n", + context->Eip, (DWORD)code_mem + 2); + ok( (context->Dr6 & 0xf) == 0, "B0...3 flags in Dr6 shouldn't be set\n"); + todo_wine{ ok( (context->Dr6 & 0x4000), "BS flag is not set in Dr6\n"); }; + } + + context->Dr6 = 0; /* clear status register */ + return ExceptionContinueExecution; +} + +static const BYTE dummy_code[] = { 0x90, 0x90, 0xc3 }; /* nop, nop, ret */ + +/* test int3 handling */ +static DWORD int3_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +{ + ok( rec->ExceptionAddress == code_mem, "exception address not at: %p, but at %p\n", + code_mem, rec->ExceptionAddress); + todo_wine { + ok( context->Eip == (DWORD)code_mem, "eip not at: %p, but at %#x\n", code_mem, context->Eip); + } + if(context->Eip == (DWORD)code_mem) context->Eip++; /* skip breakpoint */ + + return ExceptionContinueExecution; +} + +static const BYTE int3_code[] = { 0xCC, 0xc3 }; /* int 3, ret */ + + static void test_exceptions(void) { CONTEXT ctx; NTSTATUS res; pNtGetContextThread = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtGetContextThread" ); - if (!pNtGetContextThread) + pNtSetContextThread = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtSetContextThread" ); + if (!pNtGetContextThread || !pNtSetContextThread) { - trace( "NtGetContextThread not found, skipping tests\n" ); + trace( "NtGetContextThread/NtSetContextThread not found, skipping tests\n" ); return; } @@ -325,12 +399,27 @@ static void test_exceptions(void) /* test single stepping behavior */ got_exception = 0; run_exception_test(single_step_handler, NULL, &single_stepcode, sizeof(single_stepcode)); - ok(got_exception == 1, "expected 1 single step exceptions, got %d\n", got_exception); + ok(got_exception == 3, "expected 3 single step exceptions, got %d\n", got_exception); /* test alignment exceptions */ got_exception = 0; run_exception_test(align_check_handler, NULL, align_check_code, sizeof(align_check_code)); ok(got_exception == 0, "got %d alignment faults, expected 0\n", got_exception); + + /* test single stepping over hardware breakpoint */ + memset(&ctx, 0, sizeof(ctx)); + ctx.Dr0 = (DWORD) code_mem; /* set hw bp on first nop */ + ctx.Dr7 = 3; + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; + res = pNtSetContextThread( GetCurrentThread(), &ctx); + ok( res == STATUS_SUCCESS, "NtSetContextThread faild with %x\n", res); + + got_exception = 0; + run_exception_test(bpx_handler, NULL, dummy_code, sizeof(dummy_code)); + ok( got_exception == 4,"expected 4 exceptions, got %d\n", got_exception); + + /* test int3 handling */ + run_exception_test(int3_handler, NULL, int3_code, sizeof(int3_code)); } #endif /* __i386__ */

1 0

Peter Beutner : ntdll: Run exception tests from executable memory.
by Alexandre Julliard Dec. 1, 2006

Dec. 1, 2006

Module: wine Branch: master Commit: b7393f29a4027e06899929de9c395d73c4446371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7393f29a4027e06899929de9… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Thu Nov 30 17:53:48 2006 +0100 ntdll: Run exception tests from executable memory. --- dlls/ntdll/tests/exception.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 099adf0..fad46ca 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -38,6 +38,7 @@ static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static NTSTATUS (WINAPI *pNtGetContextThread)(HANDLE,CONTEXT*); +static void *code_mem; /* Test various instruction combinations that cause a protection fault on the i386, * and check what the resulting exception looks like. @@ -162,18 +163,21 @@ static const struct exception static int got_exception; -static void run_exception_test(const void *handler, const void* context, const void *code) +static void run_exception_test(const void *handler, const void* context, + const void *code, unsigned int code_size) { struct { EXCEPTION_REGISTRATION_RECORD frame; const void *context; } exc_frame; - void (*func)(void) = code; + void (*func)(void) = code_mem; exc_frame.frame.Handler = handler; exc_frame.frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; exc_frame.context = context; + memcpy(code_mem, code, code_size); + pNtCurrentTeb()->Tib.ExceptionList = &exc_frame.frame; func(); pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; @@ -191,9 +195,9 @@ static DWORD handler( EXCEPTION_RECORD * ok( rec->ExceptionCode == except->status, "%u: Wrong exception code %x/%x\n", entry, rec->ExceptionCode, except->status ); - ok( rec->ExceptionAddress == except->code + except->offset, + ok( rec->ExceptionAddress == (char*)code_mem + except->offset, "%u: Wrong exception address %p/%p\n", entry, - rec->ExceptionAddress, except->code + except->offset ); + rec->ExceptionAddress, (char*)code_mem + except->offset ); ok( rec->NumberParameters == except->nb_params, "%u: Wrong number of parameters %u/%u\n", entry, rec->NumberParameters, except->nb_params ); @@ -203,7 +207,7 @@ static DWORD handler( EXCEPTION_RECORD * entry, i, rec->ExceptionInformation[i], except->params[i] ); /* don't handle exception if it's not the address we expected */ - if (rec->ExceptionAddress != except->code + except->offset) return ExceptionContinueSearch; + if (rec->ExceptionAddress != (char*)code_mem + except->offset) return ExceptionContinueSearch; context->Eip += except->length; return ExceptionContinueExecution; @@ -216,7 +220,8 @@ static void test_prot_fault(void) for (i = 0; i < sizeof(exceptions)/sizeof(exceptions[0]); i++) { got_exception = 0; - run_exception_test(handler, &exceptions[i], &exceptions[i].code); + run_exception_test(handler, &exceptions[i], &exceptions[i].code, + sizeof(exceptions[i].code)); if (!i && !got_exception) { trace( "No exception, assuming win9x, no point in testing further\n" ); @@ -309,7 +314,7 @@ static void test_exceptions(void) } /* test handling of debug registers */ - run_exception_test(dreg_handler, NULL, &segfault_code); + run_exception_test(dreg_handler, NULL, &segfault_code, sizeof(segfault_code)); ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; res = pNtGetContextThread(GetCurrentThread(), &ctx); @@ -319,12 +324,12 @@ static void test_exceptions(void) /* test single stepping behavior */ got_exception = 0; - run_exception_test(single_step_handler, NULL, &single_stepcode); + run_exception_test(single_step_handler, NULL, &single_stepcode, sizeof(single_stepcode)); ok(got_exception == 1, "expected 1 single step exceptions, got %d\n", got_exception); /* test alignment exceptions */ got_exception = 0; - run_exception_test(align_check_handler, NULL, align_check_code); + run_exception_test(align_check_handler, NULL, align_check_code, sizeof(align_check_code)); ok(got_exception == 0, "got %d alignment faults, expected 0\n", got_exception); } @@ -340,7 +345,15 @@ START_TEST(exception) return; } + /* 1024 byte should be sufficient */ + code_mem = VirtualAlloc(NULL, 1024, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + if(!code_mem) { + trace("VirtualAlloc failed\n"); + return; + } test_prot_fault(); test_exceptions(); + + VirtualFree(code_mem, 1024, MEM_RELEASE); #endif }

1 0