February 2020 - Wine-commits

Michael Müller : setupapi: Implement SP_COPY_IN_USE_NEEDS_REBOOT.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 87b2af73baf3cc26fe5ed135cbd6ed494a9003be URL: https://source.winehq.org/git/wine.git/?a=commit;h=87b2af73baf3cc26fe5ed135… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Feb 13 03:11:22 2020 +0000 setupapi: Implement SP_COPY_IN_USE_NEEDS_REBOOT. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36059 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index aa59adf967..eebfe97154 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1117,7 +1117,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, } } if (style & (SP_COPY_NODECOMP | SP_COPY_LANGUAGEAWARE | SP_COPY_FORCE_IN_USE | - SP_COPY_IN_USE_NEEDS_REBOOT | SP_COPY_NOSKIP | SP_COPY_WARNIFSKIP)) + SP_COPY_NOSKIP | SP_COPY_WARNIFSKIP)) { ERR("Unsupported style(s) 0x%x\n",style); } @@ -1125,6 +1125,22 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, if (docopy) { rc = CopyFileW(source,target,FALSE); + if (!rc && GetLastError() == ERROR_SHARING_VIOLATION && + (style & SP_COPY_IN_USE_NEEDS_REBOOT)) + { + WCHAR temp_file[MAX_PATH]; + WCHAR temp[MAX_PATH]; + + if (GetTempPathW(MAX_PATH, temp) && + GetTempFileNameW(temp, L"SET", 0, temp_file)) + { + rc = CopyFileW(source, temp_file, FALSE); + if (rc) + rc = MoveFileExW(temp_file, target, MOVEFILE_DELAY_UNTIL_REBOOT); + else + DeleteFileW(temp_file); + } + } if (!rc) WARN( "failed to copy, err %u\n", GetLastError() ); } else

1 0

Alex Henrie : iphlpapi: Get rid of dummy arguments to sscanf.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 981894004851904aae68add7408bc7132dc2ec5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=981894004851904aae68add7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 10 23:48:45 2020 -0700 iphlpapi: Get rid of dummy arguments to sscanf. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index f09f042135..6ce322a8d1 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2088,7 +2088,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE { char buf[512], *ptr; struct pid_map *map = NULL; - unsigned int dummy, num_entries = 0; + unsigned int num_entries = 0; int inode; if (class >= TCP_TABLE_OWNER_PID_LISTENER) map = get_pid_map( &num_entries ); @@ -2097,9 +2097,9 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE ptr = fgets(buf, sizeof(buf), fp); while ((ptr = fgets(buf, sizeof(buf), fp))) { - if (sscanf( ptr, "%x: %x:%x %x:%x %x %*s %*s %*s %*s %*s %d", &dummy, + if (sscanf( ptr, "%*x: %x:%x %x:%x %x %*s %*s %*s %*s %*s %d", &row.dwLocalAddr, &row.dwLocalPort, &row.dwRemoteAddr, - &row.dwRemotePort, &row.dwState, &inode ) != 7) + &row.dwRemotePort, &row.dwState, &inode ) != 6) continue; row.dwLocalPort = htons( row.dwLocalPort ); row.dwRemotePort = htons( row.dwRemotePort ); @@ -2386,7 +2386,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE { char buf[512], *ptr; struct pid_map *map = NULL; - unsigned int dummy, num_entries = 0; + unsigned int num_entries = 0; int inode; if (class >= UDP_TABLE_OWNER_PID) map = get_pid_map( &num_entries ); @@ -2395,8 +2395,8 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE ptr = fgets( buf, sizeof(buf), fp ); while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (sscanf( ptr, "%u: %x:%x %*s %*s %*s %*s %*s %*s %*s %d", &dummy, - &row.dwLocalAddr, &row.dwLocalPort, &inode ) != 4) + if (sscanf( ptr, "%*u: %x:%x %*s %*s %*s %*s %*s %*s %*s %d", + &row.dwLocalAddr, &row.dwLocalPort, &inode ) != 3) continue; row.dwLocalPort = htons( row.dwLocalPort ); @@ -2708,7 +2708,6 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE unsigned int num_entries = 0; struct ipv6_addr_scope *addr_scopes; unsigned int addr_scopes_size = 0; - unsigned int dummy; int inode; addr_scopes = get_ipv6_addr_scope_table(&addr_scopes_size); @@ -2721,9 +2720,9 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE { DWORD *local_addr = (DWORD *)&row.ucLocalAddr; - if (sscanf( ptr, "%u: %8x%8x%8x%8x:%x %*s %*s %*s %*s %*s %*s %*s %d", &dummy, + if (sscanf( ptr, "%*u: %8x%8x%8x%8x:%x %*s %*s %*s %*s %*s %*s %*s %d", &local_addr[0], &local_addr[1], &local_addr[2], &local_addr[3], - &row.dwLocalPort, &inode ) != 7) + &row.dwLocalPort, &inode ) != 6) continue; row.dwLocalScopeId = find_ipv6_addr_scope((const IN6_ADDR *)&row.ucLocalAddr, addr_scopes, addr_scopes_size); row.dwLocalPort = htons( row.dwLocalPort );

1 0

Alex Henrie : include: Add GetIcmpStatisticsEx.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 3991bca56d824a2b0dba12a929e7802ce12c8a8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3991bca56d824a2b0dba12a9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 10 23:48:46 2020 -0700 include: Add GetIcmpStatisticsEx. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/iphlpapi.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/iphlpapi.h b/include/iphlpapi.h index c618e733e7..da5819c842 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -79,6 +79,8 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS pStats, DWORD dwFamily); DWORD WINAPI GetIcmpStatistics(PMIB_ICMP pStats); +DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX pStats, DWORD dwFamily); + DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS pStats); DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS pStats, DWORD dwFamily);

1 0

Alex Henrie : iphlpapi/tests: Print a message when skipping GetUdp6Table tests.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 31d1175f82e2d867e542f400415782b9ec939d36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31d1175f82e2d867e542f400… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 10 23:48:47 2020 -0700 iphlpapi/tests: Print a message when skipping GetUdp6Table tests. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 43 ++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index a1fdf2716b..12e39fa27f 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2233,37 +2233,40 @@ static void test_ConvertLengthToIpv4Mask(void) static void test_GetUdp6Table(void) { - if (pGetUdp6Table) { DWORD apiReturn; ULONG dwSize = 0; + if (!pGetUdp6Table) { + win_skip("GetUdp6Table not available\n"); + return; + } + apiReturn = pGetUdp6Table(NULL, &dwSize, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetUdp6Table is not supported\n"); - return; + skip("GetUdp6Table is not supported\n"); + return; } ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, - "GetUdp6Table(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", - apiReturn); + "GetUdp6Table(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", + apiReturn); if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { - PMIB_UDP6TABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); + PMIB_UDP6TABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - apiReturn = pGetUdp6Table(buf, &dwSize, FALSE); - ok(apiReturn == NO_ERROR, - "GetUdp6Table(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", - apiReturn); + apiReturn = pGetUdp6Table(buf, &dwSize, FALSE); + ok(apiReturn == NO_ERROR, + "GetUdp6Table(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", + apiReturn); - if (apiReturn == NO_ERROR && winetest_debug > 1) - { - DWORD i; - trace( "UDP6 table: %u entries\n", buf->dwNumEntries ); - for (i = 0; i < buf->dwNumEntries; i++) - trace( "%u: %s%%%u:%u\n", - i, ntoa6(&buf->table[i].dwLocalAddr), ntohs(buf->table[i].dwLocalScopeId), ntohs(buf->table[i].dwLocalPort) ); - } - HeapFree(GetProcessHeap(), 0, buf); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + DWORD i; + trace( "UDP6 table: %u entries\n", buf->dwNumEntries ); + for (i = 0; i < buf->dwNumEntries; i++) + trace( "%u: %s%%%u:%u\n", + i, ntoa6(&buf->table[i].dwLocalAddr), ntohs(buf->table[i].dwLocalScopeId), ntohs(buf->table[i].dwLocalPort) ); + } + HeapFree(GetProcessHeap(), 0, buf); } - } } static void test_ParseNetworkString(void)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 7552ed68ac3f78ece3d2e8355ab70967e8745e0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7552ed68ac3f78ece3d2e835… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Feb 13 10:11:10 2020 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index e076518132..0cd63ae667 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-02-11 09:01+0200\n" +"PO-Revision-Date: 2020-02-13 10:10+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -8402,22 +8402,20 @@ msgid "A&ccess:" msgstr "&Prieiga:" #: version.rc:106 -#, fuzzy -#| msgid "&All" msgid "All" -msgstr "&Visą" +msgstr "Visos" #: version.rc:110 msgid "" "These are the initialization properties for this type of data. To edit a " "value, select a property, then choose Edit Value below." msgstr "" +"Tai yra šio duomenų tipo inicijavimo savybės. Reikšmei redaguoti pažymėkite " +"savybę ir spauskite „Redaguoti reikšmę“." #: version.rc:111 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." -msgstr "&Redaguoti..." +msgstr "&Redaguoti reikšmę..." #: version.rc:36 msgid "Data Link Properties"

1 0

Alexandre Julliard : ntdll: Add script to generate the error mapping list.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: f7ec4d076d4f764c0bb9983f928ff90b0f0d4ecb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7ec4d076d4f764c0bb9983f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 13 09:40:26 2020 +0100 ntdll: Add script to generate the error mapping list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/error.c | 2637 ++++++++++++++++++++++-------------------------- dlls/ntdll/make_errors | 1260 +++++++++++++++++++++++ 2 files changed, 2461 insertions(+), 1436 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f7ec4d076d4f764c0bb9…

1 0

Alexandre Julliard : ntdll: Add more error mappings.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 9f9984966a52cc93105ca5a7484ec502bca28569 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f9984966a52cc93105ca5a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 13 09:53:14 2020 +0100 ntdll: Add more error mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/error.c | 596 +++++++++++++++++++++++++++++++++++++------ dlls/ntdll/make_errors | 430 ++++++++++++++++++++++++++++++- dlls/ntdll/tests/error.c | 429 +++++++++++++++++++++++++++++++ include/ntstatus.h | 288 ++++++++++++++++++++- include/winerror.h | 651 ++++++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 2313 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f9984966a52cc93105c…

1 0

Dmitry Timoshkov : include/iads.idl: Remove duplicate interface definition.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 355fdfb5f6eb7396bfa96b86b9dda3f7e7e7b868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=355fdfb5f6eb7396bfa96b86… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 13 18:27:02 2020 +0800 include/iads.idl: Remove duplicate interface definition. Otherwise widl fails to create a typelib. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/iads.idl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/iads.idl b/include/iads.idl index add52571c7..8553a03d8c 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -855,8 +855,7 @@ interface IADsADSystemInfo : IDispatch ] coclass ADSystemInfo { - [default] interface IADsADSystemInfo; - interface IDispatch; + interface IADsADSystemInfo; } } /* library */

1 0

Kevin Puetz : basetyps.h: Don't typedef wchar_t for C++.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 858f9ac0d5550c2337b672746b3b6f6d8abf6f1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=858f9ac0d5550c2337b67274… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Feb 13 11:35:36 2020 +0100 basetyps.h: Don't typedef wchar_t for C++. This matches corecrt.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/basetyps.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/basetyps.h b/include/basetyps.h index 82b25b7a17..18e15dcabd 100644 --- a/include/basetyps.h +++ b/include/basetyps.h @@ -83,7 +83,9 @@ typedef unsigned long error_status_t; #endif #ifndef _WCHAR_T_DEFINED +#ifndef __cplusplus typedef unsigned short wchar_t; +#endif #define _WCHAR_T_DEFINED #endif

1 0

Kevin Puetz : tchar.h: Allow using header without msvcrt.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: c12089039637dec5e598ed1c41e707f057494242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c12089039637dec5e598ed1c… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Feb 13 11:35:50 2020 +0100 tchar.h: Allow using header without msvcrt. It's useful for _T macro and TCHAR typedef. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/tchar.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/tchar.h b/include/tchar.h index d5e4983756..8de69c7466 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -23,10 +23,6 @@ #error Wine should not include tchar.h internally #endif -#if !defined(__MSVCRT__) && (defined(_UNICODE) || defined(_MBCS)) -#error You must use msvcrt when building in Unicode/MBCS mode [-mno-cygwin] -#endif - #ifdef __cplusplus extern "C" { #endif

1 0