May 2015 - Wine-Commits - list.winehq.org

Huw Davies : dinput/tests: Send a matching key-up event.
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: 4b110f7554460bd0743dae966c88e7715339594a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b110f7554460bd0743dae966… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 22 09:45:02 2015 +0100 dinput/tests: Send a matching key-up event. The user32 msg tests are failing (more than normal) as they still see 'Q' in the down state. --- dlls/dinput/tests/keyboard.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index a0e7d24..520740d 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -110,6 +110,7 @@ static void acquire_tests(IDirectInputA *pDI, HWND hwnd) for (i = 0; i < sizeof(custom_state) / sizeof(custom_state[0]); i++) ok(custom_state[i] == 0, "Should be zeroed, got 0x%08x\n", custom_state[i]); } + keybd_event('Q', 0, KEYEVENTF_KEYUP, 0); if (pKeyboard) IUnknown_Release(pKeyboard); }

1 0

Bruno Jesus : ws2_32: Simplify select() to make its code more reusable.
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: 2a1ae98b5545b6e3c1b29b8a2c9a8fd10f7b16cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1ae98b5545b6e3c1b29b8a2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 21 23:55:03 2015 -0300 ws2_32: Simplify select() to make its code more reusable. --- dlls/ws2_32/socket.c | 61 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index de391c9..fdf68a3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4789,6 +4789,34 @@ static void release_poll_fds( const WS_fd_set *readfds, const WS_fd_set *writefd } } +static int do_poll(struct pollfd *pollfds, int count, int timeout) +{ + struct timeval tv1, tv2; + int ret, torig = timeout; + + if (timeout > 0) gettimeofday( &tv1, 0 ); + + while ((ret = poll( pollfds, count, timeout )) < 0) + { + if (errno != EINTR) break; + if (timeout < 0) continue; + + gettimeofday( &tv2, 0 ); + + tv2.tv_sec -= tv1.tv_sec; + tv2.tv_usec -= tv1.tv_usec; + if (tv2.tv_usec < 0) + { + tv2.tv_usec += 1000000; + tv2.tv_sec -= 1; + } + + timeout = torig - (tv2.tv_sec * 1000) - (tv2.tv_usec + 999) / 1000; + if (timeout <= 0) return 0; + } + return ret; +} + /* map the poll results back into the Windows fd sets */ static int get_poll_results( WS_fd_set *readfds, WS_fd_set *writefds, WS_fd_set *exceptfds, const struct pollfd *fds ) @@ -4830,7 +4858,6 @@ static int get_poll_results( WS_fd_set *readfds, WS_fd_set *writefds, WS_fd_set return total; } - /*********************************************************************** * select (WS2_32.18) */ @@ -4839,8 +4866,6 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, const struct WS_timeval* ws_timeout) { struct pollfd *pollfds; - struct timeval tv1, tv2; - int torig = 0; int count, ret, timeout = -1; TRACE("read %p, write %p, excp %p timeout %p\n", @@ -4850,35 +4875,9 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, return SOCKET_ERROR; if (ws_timeout) - { - torig = (ws_timeout->tv_sec * 1000) + (ws_timeout->tv_usec + 999) / 1000; - timeout = torig; - gettimeofday( &tv1, 0 ); - } - - while ((ret = poll( pollfds, count, timeout )) < 0) - { - if (errno == EINTR) - { - if (!ws_timeout) continue; - gettimeofday( &tv2, 0 ); + timeout = (ws_timeout->tv_sec * 1000) + (ws_timeout->tv_usec + 999) / 1000; - tv2.tv_sec -= tv1.tv_sec; - tv2.tv_usec -= tv1.tv_usec; - if (tv2.tv_usec < 0) - { - tv2.tv_usec += 1000000; - tv2.tv_sec -= 1; - } - - timeout = torig - (tv2.tv_sec * 1000) - (tv2.tv_usec + 999) / 1000; - if (timeout <= 0) - { - ret = 0; - break; - } - } else break; - } + ret = do_poll(pollfds, count, timeout); release_poll_fds( ws_readfds, ws_writefds, ws_exceptfds, pollfds ); if (ret == -1) SetLastError(wsaErrno());

1 0

Austin English : api-ms-win-core-misc-l1-1-0: New dll.
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: 6bb558034cebb457d3cd5f80f1322104f87f933f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb558034cebb457d3cd5f80f… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 21 13:37:07 2015 -0500 api-ms-win-core-misc-l1-1-0: New dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-misc-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-misc-l1-1-0.spec | 34 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 39 insertions(+) diff --git a/configure b/configure index de5f942..28e6c19 100755 --- a/configure +++ b/configure @@ -885,6 +885,7 @@ enable_api_ms_win_core_localization_obsolete_l1_1_0 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_memory_l1_1_0 enable_api_ms_win_core_memory_l1_1_1 +enable_api_ms_win_core_misc_l1_1_0 enable_api_ms_win_core_namedpipe_l1_1_0 enable_api_ms_win_core_namedpipe_l1_2_0 enable_api_ms_win_core_processenvironment_l1_1_0 @@ -17033,6 +17034,7 @@ wine_fn_config_dll api-ms-win-core-localization-obsolete-l1-1-0 enable_api_ms_wi wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-memory-l1-1-0 enable_api_ms_win_core_memory_l1_1_0 wine_fn_config_dll api-ms-win-core-memory-l1-1-1 enable_api_ms_win_core_memory_l1_1_1 +wine_fn_config_dll api-ms-win-core-misc-l1-1-0 enable_api_ms_win_core_misc_l1_1_0 wine_fn_config_dll api-ms-win-core-namedpipe-l1-1-0 enable_api_ms_win_core_namedpipe_l1_1_0 wine_fn_config_dll api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_namedpipe_l1_2_0 wine_fn_config_dll api-ms-win-core-processenvironment-l1-1-0 enable_api_ms_win_core_processenvironment_l1_1_0 diff --git a/configure.ac b/configure.ac index 7a48000..88eb77b 100644 --- a/configure.ac +++ b/configure.ac @@ -2722,6 +2722,7 @@ WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-misc-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-1-0) diff --git a/dlls/api-ms-win-core-misc-l1-1-0/Makefile.in b/dlls/api-ms-win-core-misc-l1-1-0/Makefile.in new file mode 100644 index 0000000..2e97ef9 --- /dev/null +++ b/dlls/api-ms-win-core-misc-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-misc-l1-1-0.dll diff --git a/dlls/api-ms-win-core-misc-l1-1-0/api-ms-win-core-misc-l1-1-0.spec b/dlls/api-ms-win-core-misc-l1-1-0/api-ms-win-core-misc-l1-1-0.spec new file mode 100644 index 0000000..0d45e0d --- /dev/null +++ b/dlls/api-ms-win-core-misc-l1-1-0/api-ms-win-core-misc-l1-1-0.spec @@ -0,0 +1,34 @@ +@ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA +@ stdcall FatalAppExitA(long str) kernel32.FatalAppExitA +@ stdcall FatalAppExitW(long wstr) kernel32.FatalAppExitW +@ stdcall FormatMessageA(long ptr long long ptr long ptr) kernel32.FormatMessageA +@ stdcall FormatMessageW(long ptr long long ptr long ptr) kernel32.FormatMessageW +@ stdcall GlobalAlloc(long long) kernel32.GlobalAlloc +@ stdcall GlobalFree(long) kernel32.GlobalFree +@ stdcall IsProcessInJob(long long ptr) kernel32.IsProcessInJob +@ stdcall IsWow64Process(ptr ptr) kernel32.IsWow64Process +@ stdcall LCMapStringA(long long str long ptr long) kernel32.LCMapStringA +@ stdcall LocalAlloc(long long) kernel32.LocalAlloc +@ stdcall LocalFree(long) kernel32.LocalFree +@ stdcall LocalLock(long) kernel32.LocalLock +@ stdcall LocalReAlloc(long long long) kernel32.LocalReAlloc +@ stdcall LocalUnlock(long) kernel32.LocalUnlock +@ stdcall lstrcmpA(str str) kernel32.lstrcmpA +@ stdcall lstrcmpiA(str str) kernel32.lstrcmpiA +@ stdcall lstrcmpi(str str) kernel32.lstrcmpi +@ stdcall lstrcmpiW(wstr wstr) kernel32.lstrcmpiW +@ stdcall lstrcmp(str str) kernel32.lstrcmp +@ stdcall lstrcmpW(wstr wstr) kernel32.lstrcmpW +@ stdcall lstrcpynA(ptr str long) kernel32.lstrcpynA +@ stdcall lstrcpyn(ptr str long) kernel32.lstrcpyn +@ stdcall lstrcpynW(ptr wstr long) kernel32.lstrcpynW +@ stdcall lstrlenA(str) kernel32.lstrlenA +@ stdcall lstrlen(str) kernel32.lstrlen +@ stdcall lstrlenW(wstr) kernel32.lstrlenW +@ stdcall NeedCurrentDirectoryForExePathA(str) kernel32.NeedCurrentDirectoryForExePathA +@ stdcall NeedCurrentDirectoryForExePathW(wstr) kernel32.NeedCurrentDirectoryForExePathW +@ stdcall PulseEvent(long) kernel32.PulseEvent +@ stdcall SetHandleCount(long) kernel32.SetHandleCount +@ stdcall Sleep(long) kernel32.Sleep +@ stdcall Wow64DisableWow64FsRedirection(ptr) kernel32.Wow64DisableWow64FsRedirection +@ stdcall Wow64RevertWow64FsRedirection(ptr) kernel32.Wow64RevertWow64FsRedirection diff --git a/tools/make_specfiles b/tools/make_specfiles index 164d4f0..0184a9e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -146,6 +146,7 @@ my @dll_groups = "api-ms-win-core-errorhandling-l1-1-1", "api-ms-win-core-interlocked-l1-1-0", "api-ms-win-core-interlocked-l1-2-0", + "api-ms-win-core-misc-l1-1-0", "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-string-l1-1-0", "api-ms-win-core-sysinfo-l1-1-0",

1 0

Sebastian Lackner : wbemprox: Fix handling of arrays as query results.
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: 37b1048bd21204c222feef1f61767feecb2fc4df URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b1048bd21204c222feef1f6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 17 09:38:15 2015 +0200 wbemprox: Fix handling of arrays as query results. --- dlls/wbemprox/builtin.c | 22 ++++++++++++++++------ dlls/wbemprox/table.c | 7 ++++++- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8ba2642..f1f51c5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -938,7 +938,7 @@ struct record_service struct record_sid { const WCHAR *accountname; - const UINT8 *binaryrepresentation; + const struct array *binaryrepresentation; const WCHAR *referenceddomainname; const WCHAR *sid; UINT32 sidlength; @@ -2614,12 +2614,22 @@ static WCHAR *get_accountname( LSA_TRANSLATED_NAME *name ) if (!name || !name->Name.Buffer) return NULL; return heap_strdupW( name->Name.Buffer ); } -static UINT8 *get_binaryrepresentation( PSID sid, UINT len ) +static struct array *get_binaryrepresentation( PSID sid, UINT len ) { - UINT8 *ret = heap_alloc( len ); - if (!ret) return NULL; - memcpy( ret, sid, len ); - return ret; + struct array *array = heap_alloc( sizeof(struct array) ); + if (array) + { + UINT8 *ret = heap_alloc( len ); + if (ret) + { + memcpy( ret, sid, len ); + array->count = len; + array->ptr = ret; + return array; + } + heap_free( array ); + } + return NULL; } static WCHAR *get_referenceddomainname( LSA_REFERENCED_DOMAIN_LIST *domain ) { diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 0c57f26..273b8cb 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -288,10 +288,15 @@ void free_row_values( const struct table *table, UINT row ) if (!(table->columns[i].type & COL_FLAG_DYNAMIC)) continue; type = table->columns[i].type & COL_TYPE_MASK; - if (type == CIM_STRING || type == CIM_DATETIME || (type & CIM_FLAG_ARRAY)) + if (type == CIM_STRING || type == CIM_DATETIME) { if (get_value( table, row, i, &val ) == S_OK) heap_free( (void *)(INT_PTR)val ); } + else if (type & CIM_FLAG_ARRAY) + { + if (get_value( table, row, i, &val ) == S_OK) + destroy_array( (void *)(INT_PTR)val, type & CIM_TYPE_MASK ); + } } }

1 0

André Hentschel : wineboot: Add hardware registry keys on ARM64.
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: 48d150dc317bb7edc0c3bbf83df22d7e060a834d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d150dc317bb7edc0c3bbf83… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 21 16:12:44 2015 +0200 wineboot: Add hardware registry keys on ARM64. --- programs/wineboot/wineboot.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 0792c2d..4d70ea9 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -185,7 +185,7 @@ static void create_hardware_registry_keys(void) static const WCHAR PercentDW[] = {'%','d',0}; static const WCHAR IntelCpuDescrW[] = {'x','8','6',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','S','t','e','p','p','i','n','g',' ','%','d',0}; - static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','7',' ','M','o','d','e','l',' ','%','X', + static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; static const WCHAR IntelCpuStringW[] = {'I','n','t','e','l','(','R',')',' ','P','e','n','t','i','u','m','(','R',')',' ','4',' ', 'C','P','U',' ','2','.','4','0','G','H','z',0}; @@ -208,7 +208,8 @@ static void create_hardware_registry_keys(void) switch(sci.Architecture) { case PROCESSOR_ARCHITECTURE_ARM: - sprintfW( idW, ARMCpuDescrW, sci.Level, sci.Revision ); + case PROCESSOR_ARCHITECTURE_ARM64: + sprintfW( idW, ARMCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); break; default: case PROCESSOR_ARCHITECTURE_INTEL: @@ -226,6 +227,7 @@ static void create_hardware_registry_keys(void) switch(sci.Architecture) { case PROCESSOR_ARCHITECTURE_ARM: + case PROCESSOR_ARCHITECTURE_ARM64: set_reg_value( system_key, IdentifierW, ARMSysidW ); break; default: @@ -235,6 +237,7 @@ static void create_hardware_registry_keys(void) } if (sci.Architecture == PROCESSOR_ARCHITECTURE_ARM || + sci.Architecture == PROCESSOR_ARCHITECTURE_ARM64 || RegCreateKeyExW( system_key, fpuW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &fpu_key, NULL )) fpu_key = 0; @@ -259,6 +262,7 @@ static void create_hardware_registry_keys(void) RegCloseKey( hkey ); } if (sci.Architecture != PROCESSOR_ARCHITECTURE_ARM && + sci.Architecture != PROCESSOR_ARCHITECTURE_ARM64 && !RegCreateKeyExW( fpu_key, numW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL )) {

1 0

Ken Thomases : ntdll: Avoid one of the calls to getattrlist() when read_directory_getattrlist() checks the case sensitivity of the file system.
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: 5514df9d4e4c14cafcc4284e12d26ad6c74709fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5514df9d4e4c14cafcc4284e1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 21 11:13:35 2015 -0500 ntdll: Avoid one of the calls to getattrlist() when read_directory_getattrlist() checks the case sensitivity of the file system. Extract a new function, get_dir_case_sensitivity_attr_by_id(), from get_dir_case_sensitivity_attr(). Call that instead of get_dir_case_sensitivity() from read_directory_getattrlist(). We get the device and file system IDs from the same getattrlist() call we're already doing, so that avoids an extra call. --- dlls/ntdll/directory.c | 62 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 8e4db83..cd9fdb0 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -983,43 +983,35 @@ static void add_fs_cache( dev_t dev, fsid_t fsid, BOOLEAN case_sensitive ) } /*********************************************************************** - * get_dir_case_sensitivity_attr + * get_dir_case_sensitivity_attr_by_id * - * Checks if the volume containing the specified directory is case - * sensitive or not. Uses getattrlist(2). + * Checks if the volume with the specified device and file system IDs + * is case sensitive or not. Uses getattrlist(2). */ -static int get_dir_case_sensitivity_attr( const char *dir ) +static int get_dir_case_sensitivity_attr_by_id( dev_t dev, fsid_t fsid ) { char *mntpoint = NULL; struct attrlist attr; struct vol_caps caps; - struct get_fsid get_fsid; struct fs_cache *entry; - /* First get the FS ID of the volume */ - attr.bitmapcount = ATTR_BIT_MAP_COUNT; - attr.reserved = 0; - attr.commonattr = ATTR_CMN_DEVID|ATTR_CMN_FSID; - attr.volattr = attr.dirattr = attr.fileattr = attr.forkattr = 0; - get_fsid.size = 0; - if (getattrlist( dir, &attr, &get_fsid, sizeof(get_fsid), 0 ) != 0 || - get_fsid.size != sizeof(get_fsid)) - return -1; /* Try to look it up in the cache */ - entry = look_up_fs_cache( get_fsid.dev ); - if (entry && !memcmp( &entry->fsid, &get_fsid.fsid, sizeof(fsid_t) )) + entry = look_up_fs_cache( dev ); + if (entry && !memcmp( &entry->fsid, &fsid, sizeof(fsid_t) )) /* Cache lookup succeeded */ return entry->case_sensitive; /* Cache is stale at this point, we have to update it */ - mntpoint = get_device_mount_point( get_fsid.dev ); + mntpoint = get_device_mount_point( dev ); /* Now look up the case-sensitivity */ - attr.commonattr = 0; + attr.bitmapcount = ATTR_BIT_MAP_COUNT; + attr.reserved = attr.commonattr = 0; attr.volattr = ATTR_VOL_INFO|ATTR_VOL_CAPABILITIES; + attr.dirattr = attr.fileattr = attr.forkattr = 0; if (getattrlist( mntpoint, &attr, &caps, sizeof(caps), 0 ) < 0) { RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); - add_fs_cache( get_fsid.dev, get_fsid.fsid, TRUE ); + add_fs_cache( dev, fsid, TRUE ); return TRUE; } RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); @@ -1036,11 +1028,34 @@ static int get_dir_case_sensitivity_attr( const char *dir ) else ret = TRUE; /* Update the cache */ - add_fs_cache( get_fsid.dev, get_fsid.fsid, ret ); + add_fs_cache( dev, fsid, ret ); return ret; } return FALSE; } + +/*********************************************************************** + * get_dir_case_sensitivity_attr + * + * Checks if the volume containing the specified directory is case + * sensitive or not. Uses getattrlist(2). + */ +static int get_dir_case_sensitivity_attr( const char *dir ) +{ + struct attrlist attr; + struct get_fsid get_fsid; + + /* First get the FS ID of the volume */ + attr.bitmapcount = ATTR_BIT_MAP_COUNT; + attr.reserved = 0; + attr.commonattr = ATTR_CMN_DEVID|ATTR_CMN_FSID; + attr.volattr = attr.dirattr = attr.fileattr = attr.forkattr = 0; + get_fsid.size = 0; + if (getattrlist( dir, &attr, &get_fsid, sizeof(get_fsid), 0 ) != 0 || + get_fsid.size != sizeof(get_fsid)) + return -1; + return get_dir_case_sensitivity_attr_by_id( get_fsid.dev, get_fsid.fsid ); +} #endif /*********************************************************************** @@ -2148,6 +2163,8 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer { u_int32_t length; struct attrreference name_reference; + dev_t devid; + fsid_t fsid; fsobj_type_t type; char name[NAME_MAX * 3 + 1]; } attrlist_buffer; @@ -2179,7 +2196,7 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer memset( &attrlist, 0, sizeof(attrlist) ); attrlist.bitmapcount = ATTR_BIT_MAP_COUNT; - attrlist.commonattr = ATTR_CMN_NAME | ATTR_CMN_OBJTYPE; + attrlist.commonattr = ATTR_CMN_NAME | ATTR_CMN_DEVID | ATTR_CMN_FSID | ATTR_CMN_OBJTYPE; ret = getattrlist( unix_name, &attrlist, &attrlist_buffer, sizeof(attrlist_buffer), FSOPT_NOFOLLOW ); /* If unix_name named a symlink, the above may have succeeded even if the symlink is broken. Check that with another call without FSOPT_NOFOLLOW. We don't ask for any attributes. */ @@ -2199,7 +2216,8 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer } else io->u.Status = STATUS_NO_MORE_FILES; } - else if ((errno == ENOENT || errno == ENOTDIR) && !get_dir_case_sensitivity(".")) + else if ((errno == ENOENT || errno == ENOTDIR) && + !get_dir_case_sensitivity_attr_by_id( attrlist_buffer.devid, attrlist_buffer.fsid )) { io->u.Status = STATUS_NO_MORE_FILES; ret = 0;

1 0

André Hentschel : ntdll: Add ARMv8 detection for ARM32.
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: dec7b246f8afe516206f1a34a8d9be5963f14600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec7b246f8afe516206f1a34a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 21 16:16:52 2015 +0200 ntdll: Add ARMv8 detection for ARM32. --- dlls/ntdll/nt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8e6ce06..2acaa83 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1139,6 +1139,8 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) #else FIXME("CPU Feature detection not implemented.\n"); #endif + if (info->Level >= 8) + user_shared_data->ProcessorFeatures[PF_ARM_V8_INSTRUCTIONS_AVAILABLE] = TRUE; info->Architecture = PROCESSOR_ARCHITECTURE_ARM; }

1 0

André Hentschel : ntdll: Parse ARM64 CPU info.
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: b5b34220cc8d0c232f7b47f63440696604706eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b34220cc8d0c232f7b47f63… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 21 16:13:35 2015 +0200 ntdll: Parse ARM64 CPU info. --- dlls/ntdll/nt.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 550a91a..8e6ce06 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1146,7 +1146,54 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) { - info->Level = 8; +#ifdef linux + char line[512]; + char *s, *value; + FILE *f = fopen("/proc/cpuinfo", "r"); + if (f) + { + while (fgets(line, sizeof(line), f) != NULL) + { + /* NOTE: the ':' is the only character we can rely on */ + if (!(value = strchr(line,':'))) + continue; + /* terminate the valuename */ + s = value - 1; + while ((s >= line) && isspace(*s)) s--; + *(s + 1) = '\0'; + /* and strip leading spaces from value */ + value += 1; + while (isspace(*value)) value++; + if ((s = strchr(value,'\n'))) + *s='\0'; + if (!strcasecmp(line, "CPU architecture")) + { + if (isdigit(value[0])) + info->Level = atoi(value); + continue; + } + if (!strcasecmp(line, "CPU revision")) + { + if (isdigit(value[0])) + info->Revision = atoi(value); + continue; + } + if (!strcasecmp(line, "Features")) + { + if (strstr(value, "crc32")) + user_shared_data->ProcessorFeatures[PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE] = TRUE; + if (strstr(value, "aes")) + user_shared_data->ProcessorFeatures[PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE] = TRUE; + continue; + } + } + fclose(f); + } +#else + FIXME("CPU Feature detection not implemented.\n"); +#endif + info->Level = max(info->Level, 8); + user_shared_data->ProcessorFeatures[PF_ARM_V8_INSTRUCTIONS_AVAILABLE] = TRUE; info->Architecture = PROCESSOR_ARCHITECTURE_ARM64; }

1 0

Sebastian Lackner : ole32/tests: Add additional tests for CoWaitForMultipleHandles and WM_QUIT.
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: fdd83248b6fe9a303c40ddd6f65f1e36b33568a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd83248b6fe9a303c40ddd6f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 12 01:23:06 2014 +0100 ole32/tests: Add additional tests for CoWaitForMultipleHandles and WM_QUIT. --- dlls/ole32/tests/compobj.c | 153 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 152 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 220052d..c96d63a 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2110,6 +2110,22 @@ static DWORD CALLBACK release_semaphore_thread( LPVOID arg ) return 0; } +static DWORD CALLBACK send_message_thread(LPVOID arg) +{ + HWND hWnd = arg; + Sleep(50); + SendMessageA(hWnd, WM_DDE_FIRST, 0, 0); + return 0; +} + +static DWORD CALLBACK post_message_thread(LPVOID arg) +{ + HWND hWnd = arg; + Sleep(50); + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + return 0; +} + static void test_CoWaitForMultipleHandles(void) { static const char cls_name[] = "cowait_test_class"; @@ -2190,6 +2206,32 @@ static void test_CoWaitForMultipleHandles(void) success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); + /* test PostMessageA/SendMessageA from a different thread */ + + index = 0xdeadbeef; + thread = CreateThread(NULL, 0, post_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + index = 0xdeadbeef; + thread = CreateThread(NULL, 0, send_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + ReleaseSemaphore(handles[0], 1, NULL); ReleaseSemaphore(handles[1], 1, NULL); @@ -2271,7 +2313,7 @@ static void test_CoWaitForMultipleHandles(void) hr = CoWaitForMultipleHandles(COWAIT_INPUTAVAILABLE, 50, 2, handles, &index); ok(hr == RPC_S_CALLPENDING || broken(hr == E_INVALIDARG) || broken(hr == S_OK) /* Win 8 */, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); - ReleaseSemaphore(handles[1], 1, NULL); + if (hr != S_OK) ReleaseSemaphore(handles[1], 1, NULL); ok(index == 0 || broken(index == 1) /* Win 8 */, "expected index 0, got %u\n", index); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); ok(!success || broken(success && hr == E_INVALIDARG), @@ -2280,6 +2322,115 @@ static void test_CoWaitForMultipleHandles(void) ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(thread); + /* test behaviour of WM_QUIT (semaphores are still locked) */ + + PostMessageA(hWnd, WM_QUIT, 40, 0); + memset(&msg, 0, sizeof(msg)); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(success, "PeekMessageA failed, error %u\n", GetLastError()); + ok(msg.message == WM_QUIT, "expected msg.message = WM_QUIT, got %u\n", msg.message); + ok(msg.wParam == 40, "expected msg.wParam = 40, got %lu\n", msg.wParam); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(!success, "PeekMessageA succeeded\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + PostMessageA(hWnd, WM_QUIT, 41, 0); + thread = CreateThread(NULL, 0, post_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + todo_wine + ok(success || broken(!success) /* Win 2000/XP/8 */, "PeekMessageA failed, error %u\n", GetLastError()); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "PeekMessageA succeeded\n"); + memset(&msg, 0, sizeof(msg)); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + todo_wine + ok(!success || broken(success) /* Win 2000/XP/8 */, "PeekMessageA succeeded\n"); + if (success) + { + ok(msg.message == WM_QUIT, "expected msg.message = WM_QUIT, got %u\n", msg.message); + ok(msg.wParam == 41, "expected msg.wParam = 41, got %lu\n", msg.wParam); + } + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + PostMessageA(hWnd, WM_QUIT, 42, 0); + thread = CreateThread(NULL, 0, send_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't pump all WM_DDE_FIRST messages\n"); + memset(&msg, 0, sizeof(msg)); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(success, "PeekMessageA failed, error %u\n", GetLastError()); + ok(msg.message == WM_QUIT, "expected msg.message = WM_QUIT, got %u\n", msg.message); + ok(msg.wParam == 42, "expected msg.wParam = 42, got %lu\n", msg.wParam); + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + PostQuitMessage(43); + memset(&msg, 0, sizeof(msg)); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(success || broken(!success) /* Win 8 */, "PeekMessageA failed, error %u\n", GetLastError()); + if (!success) + win_skip("PostQuitMessage didn't queue a WM_QUIT message, skipping tests\n"); + else + { + ok(msg.message == WM_QUIT, "expected msg.message = WM_QUIT, got %u\n", msg.message); + ok(msg.wParam == 43, "expected msg.wParam = 43, got %lu\n", msg.wParam); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(!success, "PeekMessageA succeeded\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + PostQuitMessage(44); + thread = CreateThread(NULL, 0, post_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(success, "PeekMessageA failed, error %u\n", GetLastError()); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + todo_wine + ok(!success, "PeekMessageA succeeded\n"); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + todo_wine + ok(!success, "CoWaitForMultipleHandles didn't remove WM_QUIT messages\n"); + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + PostQuitMessage(45); + thread = CreateThread(NULL, 0, send_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(success, "PeekMessageA failed, error %u\n", GetLastError()); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + todo_wine + ok(!success, "PeekMessageA succeeded\n"); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't remove WM_QUIT messages\n"); + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + } + CloseHandle(handles[0]); CloseHandle(handles[1]); DestroyWindow(hWnd);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: f2988416ab4459af8d36d7cfc568a37bc6bc189e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2988416ab4459af8d36d7cfc… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu May 21 20:25:50 2015 +0300 po: Update Lithuanian translation. --- po/lt.po | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/po/lt.po b/po/lt.po index c93e7fa..f18df3e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-05-18 16:29+0300\n" +"PO-Revision-Date: 2015-05-21 20:22+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -7453,10 +7453,8 @@ msgid "Add Control" msgstr "Pridėti valdiklį" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "Š&riftas..." +msgstr "&Konvertuoti..." #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -9208,24 +9206,20 @@ msgstr "" "vietos diske, ar vis dar prisijungę prie tinklo." #: winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "„Wine“ „Mono“ diegimo programa" +msgstr "„Wine“ garso susiejiklis" #: winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "stulpelis" +msgstr "Garsumas" #: winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "Pagrindinis garsumas" #: winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "Nutildyti" #: winspool.rc:37 msgid "Print to File"

1 0