November 2022 - Wine-commits

Eric Pouech : kernel32/tests: Fix sporadic process test failure.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 1addbe3e1dfd2554418767f38b6fe36f59588172 URL: https://gitlab.winehq.org/wine/wine/-/commit/1addbe3e1dfd2554418767f38b6fe3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 4 15:41:49 2022 +0100 kernel32/tests: Fix sporadic process test failure. Current test tries to ensure that a handle, valid in process parent, hasn't been inherited, but nothing guarantees that a valid handle isn't present in child process with same value. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/process.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 287e84642be..b582727f93b 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4280,16 +4280,26 @@ static void test_handle_list_attribute(BOOL child, HANDLE handle1, HANDLE handle if (child) { + char name1[256], name2[256]; DWORD flags; flags = 0; ret = GetHandleInformation(handle1, &flags); ok(ret, "Failed to get handle info, error %ld.\n", GetLastError()); ok(flags == HANDLE_FLAG_INHERIT, "Unexpected flags %#lx.\n", flags); + ret = GetFileInformationByHandleEx(handle1, FileNameInfo, name1, sizeof(name1)); + ok(ret, "Failed to get pipe name, error %ld\n", GetLastError()); CloseHandle(handle1); - + flags = 0; ret = GetHandleInformation(handle2, &flags); - ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "Unexpected return value, error %ld.\n", GetLastError()); + if (ret) + { + ok(!(flags & HANDLE_FLAG_INHERIT), "Parent's handle shouldn't have been inherited\n"); + ret = GetFileInformationByHandleEx(handle2, FileNameInfo, name2, sizeof(name2)); + ok(!ret || strcmp(name1, name2), "Parent's handle shouldn't have been inherited\n"); + } + else + ok(GetLastError() == ERROR_INVALID_HANDLE, "Unexpected return value, error %ld.\n", GetLastError()); return; }

1 0

Alex Henrie : include: Add IN4ADDR_*_INIT to mstcpip.h.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: debc5c4961896274b56fc099e028af18a267ff66 URL: https://gitlab.winehq.org/wine/wine/-/commit/debc5c4961896274b56fc099e028af… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 13 21:21:53 2022 -0700 include: Add IN4ADDR_*_INIT to mstcpip.h. --- include/mstcpip.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/mstcpip.h b/include/mstcpip.h index cb3ce8d41d4..08201f4ea8f 100644 --- a/include/mstcpip.h +++ b/include/mstcpip.h @@ -45,6 +45,16 @@ struct tcp_keepalive #define RCVALL_ON 1 #define RCVALL_SOCKETLEVELONLY 2 +#define IN4ADDR_ANY_INIT { 0, 0, 0, 0 } +#define IN4ADDR_LOOPBACK_INIT { 126, 0, 0, 1 } +#define IN4ADDR_BROADCAST_INIT { 255, 255, 255, 255 } +#define IN4ADDR_ALLNODESONLINK_INIT { 224, 0, 0, 1 } +#define IN4ADDR_ALLROUTERSONLINK_INIT { 224, 0, 0, 2 } +#define IN4ADDR_ALLIGMPV3ROUTERSONLINK_INIT { 224, 0, 0, 22 } +#define IN4ADDR_ALLTEREDONODESONLINK_INIT { 224, 0, 0, 253 } +#define IN4ADDR_LINKLOCALPREFIX_INIT { 169, 254, 0, 0 } +#define IN4ADDR_MULTICASTPREFIX_INIT { 224, 0, 0, 0 } + #else #define WS_SIO_RCVALL _WSAIOW(WS_IOC_VENDOR, 1) @@ -63,6 +73,16 @@ struct tcp_keepalive #define WS_RCVALL_ON 1 #define WS_RCVALL_SOCKETLEVELONLY 2 +#define WS_IN4ADDR_ANY_INIT { 0, 0, 0, 0 } +#define WS_IN4ADDR_LOOPBACK_INIT { 126, 0, 0, 1 } +#define WS_IN4ADDR_BROADCAST_INIT { 255, 255, 255, 255 } +#define WS_IN4ADDR_ALLNODESONLINK_INIT { 224, 0, 0, 1 } +#define WS_IN4ADDR_ALLROUTERSONLINK_INIT { 224, 0, 0, 2 } +#define WS_IN4ADDR_ALLIGMPV3ROUTERSONLINK_INIT { 224, 0, 0, 22 } +#define WS_IN4ADDR_ALLTEREDONODESONLINK_INIT { 224, 0, 0, 253 } +#define WS_IN4ADDR_LINKLOCALPREFIX_INIT { 169, 254, 0, 0 } +#define WS_IN4ADDR_MULTICASTPREFIX_INIT { 224, 0, 0, 0 } + #endif /* USE_WS_PREFIX */ #endif /* __WINE_MSTCPIP_H */

1 0

Alex Henrie : include: Add IN6ADDR_*_INIT to ws2ipdef.h.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: dc7f972896caf84e68f7d95bad2f506c7700640b URL: https://gitlab.winehq.org/wine/wine/-/commit/dc7f972896caf84e68f7d95bad2f50… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 13 21:21:53 2022 -0700 include: Add IN6ADDR_*_INIT to ws2ipdef.h. --- include/ws2ipdef.h | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index adc534dcb32..51d4c9f5ac2 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -337,13 +337,43 @@ typedef struct WS(in6_pktinfo) { #ifndef USE_WS_PREFIX #define INET_ADDRSTRLEN 22 #define INET6_ADDRSTRLEN 65 -#define IN6ADDR_ANY_INIT { 0 } -#define IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } +#define IN6ADDR_6BONETESTPREFIX_INIT { 0x3f,0xfe,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define IN6ADDR_6TO4PREFIX_INIT { 0x20,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define IN6ADDR_ALLMLDV2ROUTERSONLINK_INIT { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0x16 } +#define IN6ADDR_ALLNODESONLINK_INIT { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } +#define IN6ADDR_ALLNODESONNODE_INIT { 0xff,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } +#define IN6ADDR_ALLROUTERSONLINK_INIT { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } +#define IN6ADDR_ANY_INIT { 0 } +#define IN6ADDR_LINKLOCALPREFIX_INIT { 0xfe,0x80,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } +#define IN6ADDR_MULTICASTPREFIX_INIT { 0xff,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define IN6ADDR_SITELOCALPREFIX_INIT { 0xfe,0xc0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define IN6ADDR_SOLICITEDNODEMULTICASTPREFIX_INIT { 0xff,2,0,0,0,0,0,0,0,0,0,0x01,0xff,0,0,0 } +#define IN6ADDR_TEREDOINITIALLINKLOCALADDRESS_INIT { 0xfe,0x80,0,0,0,0,0,0,0,0,0xff,0xff,0xff,0xff,0xff,0xfe } +#define IN6ADDR_TEREDOPREFIX_INIT { 0x20,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define IN6ADDR_TEREDOPREFIX_INIT_OLD { 0x3f,0xfe,0x83,0x1f,0,0,0,0,0,0,0,0,0,0,0,0 } +#define IN6ADDR_ULAPREFIX_INIT { 0xfc,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define IN6ADDR_V4MAPPEDPREFIX_INIT { 0,0,0,0,0,0,0,0,0,0,0xff,0xff,0,0,0,0 } #else #define WS_INET_ADDRSTRLEN 22 #define WS_INET6_ADDRSTRLEN 65 -#define WS_IN6ADDR_ANY_INIT { 0 } -#define WS_IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } +#define WS_IN6ADDR_6BONETESTPREFIX_INIT { 0x3f,0xfe,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define WS_IN6ADDR_6TO4PREFIX_INIT { 0x20,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define WS_IN6ADDR_ALLMLDV2ROUTERSONLINK_INIT { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0x16 } +#define WS_IN6ADDR_ALLNODESONLINK_INIT { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } +#define WS_IN6ADDR_ALLNODESONNODE_INIT { 0xff,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } +#define WS_IN6ADDR_ALLROUTERSONLINK_INIT { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } +#define WS_IN6ADDR_ANY_INIT { 0 } +#define WS_IN6ADDR_LINKLOCALPREFIX_INIT { 0xfe,0x80,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define WS_IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } +#define WS_IN6ADDR_MULTICASTPREFIX_INIT { 0xff,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define WS_IN6ADDR_SITELOCALPREFIX_INIT { 0xfe,0xc0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define WS_IN6ADDR_SOLICITEDNODEMULTICASTPREFIX_INIT { 0xff,2,0,0,0,0,0,0,0,0,0,0x01,0xff,0,0,0 } +#define WS_IN6ADDR_TEREDOINITIALLINKLOCALADDRESS_INIT { 0xfe,0x80,0,0,0,0,0,0,0,0,0xff,0xff,0xff,0xff,0xff,0xfe } +#define WS_IN6ADDR_TEREDOPREFIX_INIT { 0x20,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define WS_IN6ADDR_TEREDOPREFIX_INIT_OLD { 0x3f,0xfe,0x83,0x1f,0,0,0,0,0,0,0,0,0,0,0,0 } +#define WS_IN6ADDR_ULAPREFIX_INIT { 0xfc,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define WS_IN6ADDR_V4MAPPEDPREFIX_INIT { 0,0,0,0,0,0,0,0,0,0,0xff,0xff,0,0,0,0 } #endif /* USE_WS_PREFIX */ #define SS_PORT(ssp) (((PSOCKADDR_IN)(ssp))->sin_port)

1 0

Alex Henrie : ws2_32: Add in[46]addr_* constants to import library.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: a17f55f28748e38a9d48d6bdb7d68be5d95cd044 URL: https://gitlab.winehq.org/wine/wine/-/commit/a17f55f28748e38a9d48d6bdb7d68b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 13 21:21:53 2022 -0700 ws2_32: Add in[46]addr_* constants to import library. Needed to compile Tera Term. --- dlls/ws2_32/Makefile.in | 1 + dlls/ws2_32/inaddr.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ include/ws2ipdef.h | 26 +++++++++++++++++++++++++ 3 files changed, 79 insertions(+) diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in index 83ae5e915ae..c303e73d9c8 100644 --- a/dlls/ws2_32/Makefile.in +++ b/dlls/ws2_32/Makefile.in @@ -5,6 +5,7 @@ DELAYIMPORTS = dnsapi advapi32 iphlpapi user32 C_SRCS = \ async.c \ + inaddr.c \ protocol.c \ socket.c \ unixlib.c diff --git a/dlls/ws2_32/inaddr.c b/dlls/ws2_32/inaddr.c new file mode 100644 index 00000000000..f226908d02c --- /dev/null +++ b/dlls/ws2_32/inaddr.c @@ -0,0 +1,52 @@ +/* + * ws2_32 static library constants + * + * Copyright 2022 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep implib +#endif + +#include "winsock2.h" +#include "mstcpip.h" +#include "ws2ipdef.h" + +const IN_ADDR in4addr_alligmpv3routersonlink = {{ IN4ADDR_ALLIGMPV3ROUTERSONLINK_INIT }}; +const IN_ADDR in4addr_allnodesonlink = {{ IN4ADDR_ALLNODESONLINK_INIT }}; +const IN_ADDR in4addr_allroutersonlink = {{ IN4ADDR_ALLROUTERSONLINK_INIT }}; +const IN_ADDR in4addr_allteredohostsonlink = {{ IN4ADDR_ALLTEREDONODESONLINK_INIT }}; +const IN_ADDR in4addr_any = {{ IN4ADDR_ANY_INIT }}; +const IN_ADDR in4addr_broadcast = {{ IN4ADDR_BROADCAST_INIT }}; +const IN_ADDR in4addr_linklocalprefix = {{ IN4ADDR_LINKLOCALPREFIX_INIT }}; +const IN_ADDR in4addr_loopback = {{ IN4ADDR_LOOPBACK_INIT }}; +const IN_ADDR in4addr_multicastprefix = {{ IN4ADDR_MULTICASTPREFIX_INIT }}; + +const IN6_ADDR in6addr_6to4prefix = {{ IN6ADDR_6TO4PREFIX_INIT }}; +const IN6_ADDR in6addr_allmldv2routersonlink = {{ IN6ADDR_ALLMLDV2ROUTERSONLINK_INIT }}; +const IN6_ADDR in6addr_allnodesonlink = {{ IN6ADDR_ALLNODESONLINK_INIT }}; +const IN6_ADDR in6addr_allnodesonnode = {{ IN6ADDR_ALLNODESONNODE_INIT }}; +const IN6_ADDR in6addr_allroutersonlink = {{ IN6ADDR_ALLROUTERSONLINK_INIT }}; +const IN6_ADDR in6addr_any = {{ IN6ADDR_ANY_INIT }}; +const IN6_ADDR in6addr_linklocalprefix = {{ IN6ADDR_LINKLOCALPREFIX_INIT }}; +const IN6_ADDR in6addr_loopback = {{ IN6ADDR_LOOPBACK_INIT }}; +const IN6_ADDR in6addr_multicastprefix = {{ IN6ADDR_MULTICASTPREFIX_INIT }}; +const IN6_ADDR in6addr_solicitednodemulticastprefix = {{ IN6ADDR_SOLICITEDNODEMULTICASTPREFIX_INIT }}; +const IN6_ADDR in6addr_teredoinitiallinklocaladdress = {{ IN6ADDR_TEREDOINITIALLINKLOCALADDRESS_INIT }}; +const IN6_ADDR in6addr_teredoprefix = {{ IN6ADDR_TEREDOPREFIX_INIT }}; +const IN6_ADDR in6addr_teredoprefix_old = {{ IN6ADDR_TEREDOPREFIX_INIT_OLD }}; +const IN6_ADDR in6addr_v4mappedprefix = {{ IN6ADDR_V4MAPPEDPREFIX_INIT }}; diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 51d4c9f5ac2..fcb1f56c005 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -386,6 +386,32 @@ typedef struct WS(in6_pktinfo) { #define WS_SIO_IDEAL_SEND_BACKLOG_QUERY WS__IOR('t', 123, ULONG) #endif +#ifndef USE_WS_PREFIX +extern const IN_ADDR in4addr_alligmpv3routersonlink; +extern const IN_ADDR in4addr_allnodesonlink; +extern const IN_ADDR in4addr_allroutersonlink; +extern const IN_ADDR in4addr_allteredohostsonlink; +extern const IN_ADDR in4addr_any; +extern const IN_ADDR in4addr_broadcast; +extern const IN_ADDR in4addr_linklocalprefix; +extern const IN_ADDR in4addr_loopback; +extern const IN_ADDR in4addr_multicastprefix; +extern const IN6_ADDR in6addr_6to4prefix; +extern const IN6_ADDR in6addr_allmldv2routersonlink; +extern const IN6_ADDR in6addr_allnodesonlink; +extern const IN6_ADDR in6addr_allnodesonnode; +extern const IN6_ADDR in6addr_allroutersonlink; +extern const IN6_ADDR in6addr_any; +extern const IN6_ADDR in6addr_linklocalprefix; +extern const IN6_ADDR in6addr_loopback; +extern const IN6_ADDR in6addr_multicastprefix; +extern const IN6_ADDR in6addr_solicitednodemulticastprefix; +extern const IN6_ADDR in6addr_teredoinitiallinklocaladdress; +extern const IN6_ADDR in6addr_teredoprefix; +extern const IN6_ADDR in6addr_teredoprefix_old; +extern const IN6_ADDR in6addr_v4mappedprefix; +#endif + #ifdef __cplusplus extern "C" { #endif

1 0

Nikolay Sivov : d3drm: Use CRT allocation functions.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 55fbd32b166144f437ecc5ffc71d41d4df8d4d8a URL: https://gitlab.winehq.org/wine/wine/-/commit/55fbd32b166144f437ecc5ffc71d41… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 11 09:52:30 2022 +0300 d3drm: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3drm/d3drm.c | 4 +-- dlls/d3drm/d3drm_main.c | 12 ++++---- dlls/d3drm/d3drm_private.h | 1 - dlls/d3drm/device.c | 4 +-- dlls/d3drm/face.c | 4 +-- dlls/d3drm/frame.c | 52 +++++++++++++++---------------- dlls/d3drm/light.c | 4 +-- dlls/d3drm/material.c | 4 +-- dlls/d3drm/meshbuilder.c | 76 +++++++++++++++++++++++----------------------- dlls/d3drm/texture.c | 32 +++++++++---------- dlls/d3drm/viewport.c | 4 +-- 11 files changed, 98 insertions(+), 99 deletions(-)

1 0

Nikolay Sivov : d3drm/tests: Use CRT allocation functions.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 1de01fcaa6e32474d7988b3068a76ed6aac5382e URL: https://gitlab.winehq.org/wine/wine/-/commit/1de01fcaa6e32474d7988b3068a76e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 11 11:07:09 2022 +0300 d3drm/tests: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3drm/tests/d3drm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 2166c8eaf2a..a65a03c5b49 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6163,7 +6163,7 @@ static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) ret = GetTempPathA(MAX_PATH, path); ok(ret, "Failed to get temporary file path.\n"); - filename = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); + filename = malloc(MAX_PATH); ret = GetTempFileNameA(path, "d3d", 0, filename); ok(ret, "Failed to get filename.\n"); file = CreateFileA(filename, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -6178,7 +6178,7 @@ static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) ret = WriteFile(file, &file_header, sizeof(file_header), &written, NULL); ok(ret && written == sizeof(file_header), "Failed to write file header.\n"); - info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + info = calloc(1, size); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biBitCount = bpp; info->bmiHeader.biPlanes = 1; @@ -6196,10 +6196,10 @@ static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) } ret = WriteFile(file, info, size, &written, NULL); ok(ret && written == size, "Failed to write bitmap info.\n"); - HeapFree(GetProcessHeap(), 0, info); + free(info); size = w * h * (bpp / 8); - buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + buffer = calloc(1, size); for (i = 0, j = 0; i < size;) { if (palettized) @@ -6216,7 +6216,7 @@ static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) } ret = WriteFile(file, buffer, size, &written, NULL); ok(ret && written == size, "Failed to write bitmap data.\n"); - HeapFree(GetProcessHeap(), 0, buffer); + free(buffer); CloseHandle(file); @@ -6515,7 +6515,7 @@ static void test_load_texture(void) ret = DeleteFileA(filename); ok(ret, "Failed to delete bitmap \"%s\".\n", filename); - HeapFree(GetProcessHeap(), 0, filename); + free(filename); winetest_pop_context(); } @@ -6647,7 +6647,7 @@ static void test_texture_qi(void) IDirect3DRM_Release(d3drm1); check = DeleteFileA(filename); ok(check, "Cannot delete image stored in %s (error = %ld).\n", filename, GetLastError()); - HeapFree(GetProcessHeap(), 0, filename); + free(filename); } static void test_viewport_qi(void)

1 0

Mohamad Al-Jaf : mscoree: Add StrongNameTokenFromAssembly stub.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 7e60043fa2f7f3fdf804fe2ccef8a25736c6ef06 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e60043fa2f7f3fdf804fe2ccef8a2… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Nov 10 21:39:29 2022 -0500 mscoree: Add StrongNameTokenFromAssembly stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53296 --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 6 ++++++ dlls/mscorwks/mscorwks.spec | 2 +- include/strongname.h | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 92dcfd89677..92e0f60b718 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -108,7 +108,7 @@ @ stdcall StrongNameSignatureVerification(wstr long ptr) @ stdcall StrongNameSignatureVerificationEx(wstr long ptr) @ stub StrongNameSignatureVerificationFromImage -@ stub StrongNameTokenFromAssembly +@ stdcall StrongNameTokenFromAssembly(wstr ptr ptr) @ stub StrongNameTokenFromAssemblyEx @ stub StrongNameTokenFromPublicKey @ stub TranslateSecurityAttributes diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index e19d50595b4..a6134f0226b 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -625,6 +625,12 @@ BOOLEAN WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOLEAN force return TRUE; } +BOOLEAN WINAPI StrongNameTokenFromAssembly(LPCWSTR path, BYTE **token, ULONG *size) +{ + FIXME("(%s, %p, %p): stub\n", debugstr_w(path), token, size); + return FALSE; +} + HRESULT WINAPI CreateDebuggingInterfaceFromVersion(int nDebugVersion, LPCWSTR version, IUnknown **ppv) { static const WCHAR v2_0[] = {'v','2','.','0','.','5','0','7','2','7',0}; diff --git a/dlls/mscorwks/mscorwks.spec b/dlls/mscorwks/mscorwks.spec index 617cde3173d..cf7cfdee47f 100644 --- a/dlls/mscorwks/mscorwks.spec +++ b/dlls/mscorwks/mscorwks.spec @@ -101,7 +101,7 @@ @ stdcall StrongNameSignatureVerification(wstr long ptr) mscoree.StrongNameSignatureVerification @ stdcall StrongNameSignatureVerificationEx(wstr long ptr) mscoree.StrongNameSignatureVerificationEx @ stub StrongNameSignatureVerificationFromImage -@ stub StrongNameTokenFromAssembly +@ stdcall StrongNameTokenFromAssembly(wstr ptr ptr) mscoree.StrongNameTokenFromAssembly @ stub StrongNameTokenFromAssemblyEx @ stub StrongNameTokenFromPublicKey @ stub TranslateSecurityAttributes diff --git a/include/strongname.h b/include/strongname.h index f05861ad28d..1134d63d3b3 100644 --- a/include/strongname.h +++ b/include/strongname.h @@ -35,5 +35,6 @@ BOOLEAN __stdcall StrongNameSignatureVerification(const WCHAR *path, DWORD flags, DWORD *ret_flags); BOOLEAN __stdcall StrongNameSignatureVerificationEx(const WCHAR *path, BOOLEAN force, BOOLEAN *verified); +BOOLEAN __stdcall StrongNameTokenFromAssembly(const WCHAR *path, BYTE **token, ULONG *size); #endif

1 0

Connor McAdams : uiautomationcore: Add UiaFind stub.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: af0c9d0b7c99c24d74350fc5578b0d01c6a441b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/af0c9d0b7c99c24d74350fc5578b0d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Aug 26 10:05:10 2022 -0500 uiautomationcore: Add UiaFind stub. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 1007 +++++++++++++++++++++++++++ dlls/uiautomationcore/uia_client.c | 10 + dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 9 + 4 files changed, 1027 insertions(+), 1 deletion(-)

1 0

Connor McAdams : uiautomationcore: Partially implement UiaFind.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 76f20d6a4b1ed779a725ef7278f867d27da4e2a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/76f20d6a4b1ed779a725ef7278f867… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sun Nov 6 13:04:10 2022 -0500 uiautomationcore: Partially implement UiaFind. Implement UiaFind for single node searches. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 29 ++- dlls/uiautomationcore/uia_client.c | 274 ++++++++++++++++++++++++++++- 2 files changed, 285 insertions(+), 18 deletions(-)

1 0

Connor McAdams : uiautomationcore: Add support for ExcludeRoot parameter in UiaFind.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 67dd36095f12baa39f54919ca8fb65f22778242b URL: https://gitlab.winehq.org/wine/wine/-/commit/67dd36095f12baa39f54919ca8fb65… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Nov 11 15:57:40 2022 -0500 uiautomationcore: Add support for ExcludeRoot parameter in UiaFind. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 44 ++++++++++++++---------------- dlls/uiautomationcore/uia_client.c | 43 +++++++++++++++++------------ 2 files changed, 45 insertions(+), 42 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 3636a0746e4..01f74cb4f3f 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -8800,35 +8800,31 @@ static void test_UiaFind(void) AutomationElementMode_Full); set_find_params(&find_params, 1, TRUE, TRUE, (struct UiaCondition *)&UiaTrueCondition); hr = UiaFind(node, &find_params, &cache_req, &out_req, &offsets, &tree_structs); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(Provider_child.ref == 2, "Unexpected refcnt %ld\n", Provider_child.ref); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(Provider_child.ref == 2, "Unexpected refcnt %ld\n", Provider_child.ref); - node2 = NULL; - if (SUCCEEDED(hr)) - { - add_provider_desc(&exp_node_desc[0], L"Main", L"Provider_child", TRUE); - exp_lbound[0] = exp_lbound[1] = 0; - exp_elems[0] = exp_elems[1] = 1; + add_provider_desc(&exp_node_desc[0], L"Main", L"Provider_child", TRUE); + exp_lbound[0] = exp_lbound[1] = 0; + exp_elems[0] = exp_elems[1] = 1; - idx[0] = idx[1] = 0; - hr = SafeArrayGetElement(out_req, idx, &v); - ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + idx[0] = idx[1] = 0; + hr = SafeArrayGetElement(out_req, idx, &v); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); - /* node2 is now set as Provider_child. */ - hr = UiaHUiaNodeFromVariant(&v, &node2); - ok(hr == S_OK, "Unexpected hr %#lx\n", hr); - IUnknown_AddRef((IUnknown *)node2); + /* node2 is now set as Provider_child. */ + hr = UiaHUiaNodeFromVariant(&v, &node2); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + IUnknown_AddRef((IUnknown *)node2); - test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); + test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); - for (i = 0; i < exp_elems[0]; i++) - { - exp_offset[i] = i; - exp_tree_struct[i] = L"P)"; - } - test_find_sa_results(tree_structs, offsets, exp_elems[0], exp_tree_struct, exp_offset); - ok_method_sequence(find_seq4, "find_seq4"); + for (i = 0; i < exp_elems[0]; i++) + { + exp_offset[i] = i; + exp_tree_struct[i] = L"P)"; } + test_find_sa_results(tree_structs, offsets, exp_elems[0], exp_tree_struct, exp_offset); + ok_method_sequence(find_seq4, "find_seq4"); SafeArrayDestroy(out_req); SafeArrayDestroy(offsets); @@ -8910,7 +8906,7 @@ static void test_UiaFind(void) SafeArrayDestroy(offsets); SafeArrayDestroy(tree_structs); - todo_wine ok(UiaNodeRelease(node2), "UiaNodeRelease returned FALSE\n"); + ok(UiaNodeRelease(node2), "UiaNodeRelease returned FALSE\n"); ok(Provider_child.ref == 1, "Unexpected refcnt %ld\n", Provider_child.ref); initialize_provider_tree(FALSE); diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 49c59f45b34..d2f7ea66414 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -967,8 +967,8 @@ static HRESULT traverse_uia_node_tree_siblings(HUIANODE huianode, struct UiaCond */ static HRESULT traverse_uia_node_tree(HUIANODE huianode, struct UiaCondition *view_cond, struct UiaCondition *search_cond, struct UiaCondition *pre_sibling_nav_stop_cond, - struct UiaCondition *ascending_stop_cond, int traversal_opts, BOOL at_root_level, int max_depth, int *cur_depth, - HUIANODE *out_node) + struct UiaCondition *ascending_stop_cond, int traversal_opts, BOOL at_root_level, BOOL *root_found, + int max_depth, int *cur_depth, HUIANODE *out_node) { HUIANODE node = huianode; HRESULT hr; @@ -990,17 +990,23 @@ static HRESULT traverse_uia_node_tree(HUIANODE huianode, struct UiaCondition *vi * our current depth within the tree. */ incr_depth = TRUE; - hr = uia_condition_check(node, search_cond); - if (FAILED(hr)) - break; - if (uia_condition_matched(hr)) + if (*root_found) { - IWineUiaNode_AddRef(&node_data->IWineUiaNode_iface); - *out_node = node; - hr = S_FALSE; - break; + hr = uia_condition_check(node, search_cond); + if (FAILED(hr)) + break; + + if (uia_condition_matched(hr)) + { + IWineUiaNode_AddRef(&node_data->IWineUiaNode_iface); + *out_node = node; + hr = S_FALSE; + break; + } } + + *root_found = TRUE; } if (incr_depth) @@ -1016,7 +1022,7 @@ static HRESULT traverse_uia_node_tree(HUIANODE huianode, struct UiaCondition *vi if (SUCCEEDED(hr) && node2) hr = traverse_uia_node_tree(node2, view_cond, search_cond, pre_sibling_nav_stop_cond, ascending_stop_cond, - traversal_opts, FALSE, max_depth, cur_depth, out_node); + traversal_opts, FALSE, root_found, max_depth, cur_depth, out_node); if (FAILED(hr) || hr == S_FALSE) break; @@ -2752,6 +2758,7 @@ HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, str struct UiaCondition *sibling_stop_cond; int cur_depth = 0; BSTR tree_struct; + BOOL root_found; HUIANODE node2; HRESULT hr; LONG idx; @@ -2769,12 +2776,6 @@ HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, str return E_NOTIMPL; } - if (find_params->ExcludeRoot) - { - FIXME("ExcludeRoot currently unimplemented.\n"); - return E_NOTIMPL; - } - /* * If the initial node has a runtime ID, we'll use it as a stop * condition. @@ -2789,10 +2790,16 @@ HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, str else sibling_stop_cond = (struct UiaCondition *)&UiaFalseCondition; + if (find_params->ExcludeRoot) + root_found = FALSE; + else + root_found = TRUE; + node2 = NULL; IWineUiaNode_AddRef(&node->IWineUiaNode_iface); hr = traverse_uia_node_tree(huianode, cache_req->pViewCondition, find_params->pFindCondition, sibling_stop_cond, - cache_req->pViewCondition, TreeTraversalOptions_Default, TRUE, find_params->MaxDepth, &cur_depth, &node2); + cache_req->pViewCondition, TreeTraversalOptions_Default, TRUE, &root_found, find_params->MaxDepth, + &cur_depth, &node2); if (FAILED(hr) || !node2) goto exit;

1 0