December 2021 - Wine-Commits

Alexandre Julliard : winecrt0: Check __WINE_PE_BUILD instead of compiler macros.
by Alexandre Julliard Dec. 27, 2021

Dec. 27, 2021

Module: wine Branch: master Commit: 49ee0f58e8e1f993c2fb91c088bc88a373c16e02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49ee0f58e8e1f993c2fb91c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 27 15:01:47 2021 +0100 winecrt0: Check __WINE_PE_BUILD instead of compiler macros. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52287 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/register.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c index ce4167b9647..757e424fed5 100644 --- a/dlls/winecrt0/register.c +++ b/dlls/winecrt0/register.c @@ -31,7 +31,7 @@ static inline void *image_base(void) { -#if defined(__MINGW32__) || defined(_MSC_VER) +#ifdef __WINE_PE_BUILD extern IMAGE_DOS_HEADER __ImageBase; return (void *)&__ImageBase; #else

1 0

Alex Henrie : advapi32/tests: Accept a variable number of x's in some RegEnumValue name overflow tests.
by Alexandre Julliard Dec. 27, 2021

Dec. 27, 2021

Module: wine Branch: master Commit: b75bd0627ee9152bab2b0e206bd1f40c59ddc8f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b75bd0627ee9152bab2b0e20… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 26 23:21:18 2021 -0700 advapi32/tests: Accept a variable number of x's in some RegEnumValue name overflow tests. Fixes intermittent testbot failures. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index ca371f73d65..af4ed1e8465 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -545,7 +545,7 @@ static void test_enum_value(void) data_count = 20; type = 1234; strcpy( value, "xxxxxxxxxx" ); - strcpy( data, "xxxxxxxxxx" ); + memset( data, 'x', sizeof(data) ); res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 3, "val_count set to %d\n", val_count ); @@ -555,15 +555,16 @@ static void test_enum_value(void) /* v5.1.2600.0 (XP Home and Professional) does not touch value or data in this case */ ok( !strcmp( value, "Te" ) || !strcmp( value, "xxxxxxxxxx" ), "value set to '%s' instead of 'Te' or 'xxxxxxxxxx'\n", value ); - ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count > 7 ), - "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || + broken( data_count > 7 && strspn( data, "x" ) == data_count && data[data_count] == 0 ), + "data set to '%s' instead of 'foobar' or x's, data_count=%u\n", data, data_count ); /* overflow empty name */ val_count = 0; data_count = 20; type = 1234; strcpy( value, "xxxxxxxxxx" ); - strcpy( data, "xxxxxxxxxx" ); + memset( data, 'x', sizeof(data) ); res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 0, "val_count set to %d\n", val_count ); @@ -572,8 +573,9 @@ static void test_enum_value(void) ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); /* v5.1.2600.0 (XP Home and Professional) does not touch data in this case */ - ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count > 7 ), - "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || + broken( data_count > 7 && strspn( data, "x" ) == data_count && data[data_count] == 0 ), + "data set to '%s' instead of 'foobar' or x's, data_count=%u\n", data, data_count ); /* overflow data */ val_count = 20;

1 0

Alex Henrie : kernel32/tests: Ensure auto_value.data is initialized in test_ExitCode (Coverity).
by Alexandre Julliard Dec. 27, 2021

Dec. 27, 2021

Module: wine Branch: master Commit: b7223aff364081d30321b8761c3b62acdaa106ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7223aff364081d30321b876… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 26 16:09:01 2021 -0700 kernel32/tests: Ensure auto_value.data is initialized in test_ExitCode (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 0955025a650..8b82aaecb9e 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -752,7 +752,11 @@ static void test_ExitCode(void) ok(0, "could not open the AeDebug key: %d\n", ret); return; } - else debugger_value.data = NULL; + else + { + auto_value.data = NULL; + debugger_value.data = NULL; + } if (debugger_value.data && debugger_value.type == REG_SZ && strstr((char*)debugger_value.data, "winedbg --auto"))

1 0

Alex Henrie : comctl32/tests: Mark smaller propsheet buffer as broken.
by Alexandre Julliard Dec. 27, 2021

Dec. 27, 2021

Module: wine Branch: master Commit: 8fd1bd964606b039c4eedebd1c041d3d613128e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fd1bd964606b039c4eedebd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 26 20:30:19 2021 -0700 comctl32/tests: Mark smaller propsheet buffer as broken. Fixes another testbot failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index b4696112500..f26fb1bd3ca 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -92,8 +92,11 @@ static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) size = SizeofResource(module, hrsrc); ok(size != 0, "Failed to get size of propsheet dialog resource\n"); buffer_size = HeapSize(GetProcessHeap(), 0, (void *)lparam); - /* Hebrew Windows 10 allocates 2 * size + 8, all others allocate 2 * size */ - ok(buffer_size >= 2 * size, "Unexpected template buffer size %u, resource size %u\n", + /* Hebrew Windows 10 allocates 2 * size + 8, + * Arabic Windows 10 allocates 2 * size - 32, + * all others allocate exactly 2 * size */ + ok(buffer_size >= 2 * size || broken(buffer_size == 2 * size - 32), + "Unexpected template buffer size %u, resource size %u\n", buffer_size, size); break; }

1 0

Alexandre Julliard : Wine release 7.0-rc3
by Alexandre Julliard Dec. 26, 2021

Dec. 26, 2021

Module: website Branch: master Commit: 3e9a1378c6ba737c26b97934e5261552bb064d00 URL: https://source.winehq.org/git/website.git/?a=commit;h=3e9a1378c6ba737c26b97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 26 17:44:38 2021 +0100 Wine release 7.0-rc3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021122601.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2021122601.xml b/news/en/2021122601.xml new file mode 100644 index 00000000..929bb39e --- /dev/null +++ b/news/en/2021122601.xml @@ -0,0 +1,13 @@ +<news> +<date>December 26, 2021</date> +<title>Wine 7.0-rc3 Released</title> +<body> + The Wine development release 7.0-rc3 is now available. + <a href="{$root}/announce/7.0-rc3">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.0/wine-7.0-rc3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Torge Matthies : ws2_32/tests: Test short fd_set with select().
by Alexandre Julliard Dec. 26, 2021

Dec. 26, 2021

Module: wine Branch: master Commit: 566668882eaae839f7d8e28f1ffb68d7c68598db URL: https://source.winehq.org/git/wine.git/?a=commit;h=566668882eaae839f7d8e28f… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Fri Dec 24 01:51:30 2021 +0100 ws2_32/tests: Test short fd_set with select(). Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 02713a7c625..d1cefd5eccc 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3152,7 +3152,7 @@ static void test_select(void) static char tmp_buf[1024]; SOCKET fdListen, fdRead, fdWrite; - fd_set readfds, writefds, exceptfds; + fd_set readfds, writefds, exceptfds, *alloc_readfds; unsigned int maxfd; int ret, len; char buffer; @@ -3160,7 +3160,8 @@ static void test_select(void) struct sockaddr_in address; select_thread_params thread_params; HANDLE thread_handle; - DWORD ticks, id; + DWORD ticks, id, old_protect; + char *page_pair; fdRead = socket(AF_INET, SOCK_STREAM, 0); ok( (fdRead != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); @@ -3326,6 +3327,15 @@ static void test_select(void) ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); + page_pair = VirtualAlloc(NULL, 0x1000 * 2, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + VirtualProtect(page_pair + 0x1000, 0x1000, PAGE_NOACCESS, &old_protect); + alloc_readfds = (fd_set *)((page_pair + 0x1000) - offsetof(fd_set, fd_array[1])); + alloc_readfds->fd_count = 1; + alloc_readfds->fd_array[0] = fdRead; + ret = select(fdRead+1, alloc_readfds, NULL, NULL, &select_timeout); + ok(ret == 1, "select returned %d\n", ret); + VirtualFree(page_pair, 0, MEM_RELEASE); + closesocket(fdRead); closesocket(fdWrite);

1 0

Alexandre Julliard : Release 7.0-rc3.
by Alexandre Julliard Dec. 26, 2021

Dec. 26, 2021

Module: wine Branch: master Commit: dc08a2d5eacfc57f7a56cdfc740ff5a728fe3206 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc08a2d5eacfc57f7a56cdfc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 26 17:42:28 2021 +0100 Release 7.0-rc3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 268 +++++++++++++++++++++++++++----------------------------------- VERSION | 2 +- configure | 18 ++--- 3 files changed, 127 insertions(+), 161 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc08a2d5eacfc57f7a56…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Dec. 26, 2021

Dec. 26, 2021

Module: wine Branch: master Commit: 4d38fe92ee1be90de0f288f326c45c797d3bd791 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d38fe92ee1be90de0f288f3… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Dec 25 07:50:10 2021 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/po/fi.po b/po/fi.po index 434bc4c7305..dc8d41255c0 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10523,22 +10523,16 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) Dublin, Edinburgh, Lissabon, Lontoo" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Sudan Standard Time" msgid "South Sudan Standard Time" -msgstr "Sudanin normaaliaika" +msgstr "Etelä-Sudanin normaaliaika" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Sudan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "Sudanin kesäaika" +msgstr "Etelä-Sudanin kesäaika" #: dlls/tzres/tzres.rc:344 -#, fuzzy -#| msgid "(UTC+02:00) Jerusalem" msgid "(UTC+02:00) Juba" -msgstr "(UTC+02:00) Jerusalem" +msgstr "(UTC+02:00) Juba" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -13219,10 +13213,8 @@ msgid "Active code page: %1!u!\n" msgstr "Aktiivinen koodisivu: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "Viesti ei kelpaa.\n" +msgstr "Koodisivu ei kelpaa.\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13241,7 +13233,7 @@ msgstr "" "\n" " numero Aktivoitava koodisivu.\n" "\n" -" CHCP ilman numeroa näyttää aktiivisen konsolin koodisivun.\n" +" CHCP ilman numeroa näyttää aktiivisen koodisivun.\n" "\n" #: programs/clock/clock.rc:32

1 0

Torge Matthies : ws2_32: Don't read more than necessary from the inputs in select().
by Alexandre Julliard Dec. 26, 2021

Dec. 26, 2021

Module: wine Branch: master Commit: ae0209a33665e16db885f38a12300d581d516123 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae0209a33665e16db885f38a… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Fri Dec 24 01:51:29 2021 +0100 ws2_32: Don't read more than necessary from the inputs in select(). .NET Framework / old .NET Core seems to allocate not more space than necessary for the fd_set inputs, so if the allocation fell on the edge of the end of the heap, Wine tried to read past it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52259 Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 648284c10a3..698e788c459 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2395,9 +2395,9 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, FD_ZERO( &read ); FD_ZERO( &write ); FD_ZERO( &except ); - if (read_ptr) read = *read_ptr; - if (write_ptr) write = *write_ptr; - if (except_ptr) except = *except_ptr; + if (read_ptr) read.fd_count = read_ptr->fd_count; + if (write_ptr) write.fd_count = write_ptr->fd_count; + if (except_ptr) except.fd_count = except_ptr->fd_count; if (!(sync_event = get_sync_event())) return -1; @@ -2408,7 +2408,7 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, for (i = 0; i < read.fd_count; ++i) { - params->sockets[params->count].socket = read.fd_array[i]; + params->sockets[params->count].socket = read.fd_array[i] = read_ptr->fd_array[i]; params->sockets[params->count].flags = AFD_POLL_READ | AFD_POLL_ACCEPT | AFD_POLL_HUP; ++params->count; poll_socket = read.fd_array[i]; @@ -2416,7 +2416,7 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, for (i = 0; i < write.fd_count; ++i) { - params->sockets[params->count].socket = write.fd_array[i]; + params->sockets[params->count].socket = write.fd_array[i] = write_ptr->fd_array[i]; params->sockets[params->count].flags = AFD_POLL_WRITE; ++params->count; poll_socket = write.fd_array[i]; @@ -2424,7 +2424,7 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, for (i = 0; i < except.fd_count; ++i) { - params->sockets[params->count].socket = except.fd_array[i]; + params->sockets[params->count].socket = except.fd_array[i] = except_ptr->fd_array[i]; params->sockets[params->count].flags = AFD_POLL_OOB | AFD_POLL_CONNECT_ERR; ++params->count; poll_socket = except.fd_array[i];

1 0

Tag wine-7.0-rc3 : Alexandre Julliard : Release 7.0-rc3
by Alexandre Julliard Dec. 26, 2021

Dec. 26, 2021

Module: wine Branch: refs/tags/wine-7.0-rc3 Tag: 432acfc208e9b4a655afb3a06b9327c31423cbaf URL: https://source.winehq.org/git/wine.git/?a=tag;h=432acfc208e9b4a655afb3a06b9… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 26 17:42:28 2021 +0100 Release 7.0-rc3

1 0