February 2024 - Wine-commits

Alexandre Julliard : win32u: Add a wrapper macro for ARM64EC syscalls.
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 79b9b60914eefffb529f333d11e8b573ad2a15b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/79b9b60914eefffb529f333d11e8b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 26 12:42:45 2024 +0100 win32u: Add a wrapper macro for ARM64EC syscalls. --- dlls/win32u/main.c | 805 +++++++++++++++++++++++++++-------------------------- 1 file changed, 403 insertions(+), 402 deletions(-)

1 0

Alexandre Julliard : include: Add SEH information to ARM64EC syscalls.
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 0abbb467af8e9b6025a28bd46ea168306ddf0414 URL: https://gitlab.winehq.org/wine/wine/-/commit/0abbb467af8e9b6025a28bd46ea168… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 26 13:02:58 2024 +0100 include: Add SEH information to ARM64EC syscalls. --- dlls/ntdll/signal_arm64ec.c | 10 +++++----- dlls/win32u/main.c | 2 +- include/wine/asm.h | 18 ++++++++++-------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 9a20a827964..e03878d521f 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -48,7 +48,7 @@ ALL_SYSCALLS64 }; #define SYSCALL_API __attribute__((naked)) -#define SYSCALL_FUNC(name) __ASM_SYSCALL_FUNC( __id_##name ) +#define SYSCALL_FUNC(name) __ASM_SYSCALL_FUNC( __id_##name, name ) NTSTATUS SYSCALL_API NtAcceptConnectPort( HANDLE *handle, ULONG id, LPC_MESSAGE *msg, BOOLEAN accept, LPC_SECTION_WRITE *write, LPC_SECTION_READ *read ) @@ -203,7 +203,7 @@ NTSTATUS SYSCALL_API NtConnectPort( HANDLE *handle, UNICODE_STRING *name, SECURI static NTSTATUS SYSCALL_API syscall_NtContinue( ARM64_NT_CONTEXT *context, BOOLEAN alertable ) { - __ASM_SYSCALL_FUNC( __id_NtContinue ); + __ASM_SYSCALL_FUNC( __id_NtContinue, syscall_NtContinue ); } NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable ) @@ -502,7 +502,7 @@ NTSTATUS SYSCALL_API NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTI static NTSTATUS SYSCALL_API syscall_NtGetContextThread( HANDLE handle, ARM64_NT_CONTEXT *context ) { - __ASM_SYSCALL_FUNC( __id_NtGetContextThread ); + __ASM_SYSCALL_FUNC( __id_NtGetContextThread, syscall_NtGetContextThread ); } NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) @@ -995,7 +995,7 @@ NTSTATUS SYSCALL_API NtQueueApcThread( HANDLE handle, PNTAPCFUNC func, ULONG_PTR static NTSTATUS SYSCALL_API syscall_NtRaiseException( EXCEPTION_RECORD *rec, ARM64_NT_CONTEXT *context, BOOL first_chance ) { - __ASM_SYSCALL_FUNC( __id_NtRaiseException ); + __ASM_SYSCALL_FUNC( __id_NtRaiseException, syscall_NtRaiseException ); } NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) @@ -1137,7 +1137,7 @@ NTSTATUS SYSCALL_API NtSecureConnectPort( HANDLE *handle, UNICODE_STRING *name, static NTSTATUS SYSCALL_API syscall_NtSetContextThread( HANDLE handle, const ARM64_NT_CONTEXT *context ) { - __ASM_SYSCALL_FUNC( __id_NtSetContextThread ); + __ASM_SYSCALL_FUNC( __id_NtSetContextThread, syscall_NtSetContextThread ); } NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c index 7f88bb0186a..1e6c5c56daf 100644 --- a/dlls/win32u/main.c +++ b/dlls/win32u/main.c @@ -46,7 +46,7 @@ ALL_SYSCALLS64 }; #define SYSCALL_API __attribute__((naked)) -#define SYSCALL_FUNC(name) __ASM_SYSCALL_FUNC( __id_##name ) +#define SYSCALL_FUNC(name) __ASM_SYSCALL_FUNC( __id_##name, name ) INT SYSCALL_API NtGdiAbortDoc( HDC hdc ) { diff --git a/include/wine/asm.h b/include/wine/asm.h index 908c7d7d19a..694e647ac83 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -209,7 +209,7 @@ #elif defined __aarch64__ # define __ASM_SYSCALL_FUNC(id,name) \ __ASM_GLOBAL_FUNC( name, \ - __ASM_SEH(".seh_endprologue\n\t") \ + ".seh_endprologue\n\t" \ "mov x8, #(" #id ")\n\t" \ "mov x9, x30\n\t" \ "ldr x16, 1f\n\t" \ @@ -218,13 +218,16 @@ "ret\n" \ "1:\t.quad " __ASM_NAME("__wine_syscall_dispatcher") ) #elif defined __arm64ec__ -# define __ASM_SYSCALL_FUNC(id) \ - asm( "mov x8, #%0\n\t" \ +# define __ASM_SYSCALL_FUNC(id,name) \ + asm( ".seh_proc " #name "\n\t" \ + ".seh_endprologue\n\t" \ + "mov x8, #%0\n\t" \ "mov x9, x30\n\t" \ - "adr x16, " __ASM_NAME("__wine_syscall_dispatcher") "\n\t" \ - "ldr x16, [x16]\n\t" \ + "adrp x16, __wine_syscall_dispatcher\n\t" \ + "ldr x16, [x16, :lo12:__wine_syscall_dispatcher]\n\t" \ "blr x16\n\t" \ - "ret" :: "i" (id) ) + "ret\n\t" \ + ".seh_endproc" :: "i" (id) ) #elif defined __x86_64__ /* Chromium depends on syscall thunks having the same form as on * Windows. For 64-bit systems the only viable form we can emulate is @@ -234,7 +237,7 @@ # ifdef __WINE_PE_BUILD # define __ASM_SYSCALL_FUNC(id,name) \ __ASM_GLOBAL_FUNC( name, \ - __ASM_SEH(".seh_endprologue\n\t") \ + ".seh_endprologue\n\t" \ ".byte 0x4c,0x8b,0xd1\n\t" /* movq %rcx,%r10 */ \ ".byte 0xb8\n\t" /* movl $i,%eax */ \ ".long (" #id ")\n\t" \ @@ -250,7 +253,6 @@ # else # define __ASM_SYSCALL_FUNC(id,name) \ __ASM_GLOBAL_FUNC( name, \ - __ASM_SEH(".seh_endprologue\n\t") \ ".byte 0x4c,0x8b,0xd1\n\t" /* movq %rcx,%r10 */ \ ".byte 0xb8\n\t" /* movl $i,%eax */ \ ".long (" #id ")\n\t" \

1 0

Alexandre Julliard : ntdll: Add SEH information to ARM64EC breakpoints.
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 2aee2990c05b659ba39e7b26bfd81f89d284b0e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/2aee2990c05b659ba39e7b26bfd81f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 26 13:29:32 2024 +0100 ntdll: Add SEH information to ARM64EC breakpoints. --- dlls/ntdll/signal_arm64ec.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index e03878d521f..a2b21f51ead 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1817,7 +1817,11 @@ void WINAPI DbgUiRemoteBreakin( void *arg ) */ void __attribute__((naked)) DbgBreakPoint(void) { - asm( "brk #0xf000; ret" ); + asm( ".seh_proc DbgBreakPoint\n\t" + ".seh_endprologue\n\t" + "brk #0xf000\n\t" + "ret\n\t" + ".seh_endproc" ); } @@ -1826,7 +1830,11 @@ void __attribute__((naked)) DbgBreakPoint(void) */ void __attribute__((naked)) DbgUserBreakPoint(void) { - asm( "brk #0xf000; ret" ); + asm( ".seh_proc DbgUserBreakPoint\n\t" + ".seh_endprologue\n\t" + "brk #0xf000\n\t" + "ret\n\t" + ".seh_endproc" ); } #endif /* __arm64ec__ */

1 0

Eric Pouech : server: Allow 0-write length in WriteProcessMemory().
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 9897719562fc47d8d3476928d3db0dd5eb6dfb28 URL: https://gitlab.winehq.org/wine/wine/-/commit/9897719562fc47d8d3476928d3db0d… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Feb 26 12:12:50 2024 +0100 server: Allow 0-write length in WriteProcessMemory(). Adapt to Win >= 10 behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56357 Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 8 ++++++++ server/process.c | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index c54fb16ba15..a023104ad88 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -114,6 +114,14 @@ static void test_VirtualAllocEx(void) ok(b && (bytes_read == alloc_size), "%Iu bytes read\n", bytes_read); ok(!memcmp(src, dst, alloc_size), "Data from remote process differs\n"); + /* test 0 length */ + bytes_written = 0xdeadbeef; + b = WriteProcessMemory(hProcess, addr1, src, 0, &bytes_written); + ok((b && !bytes_written) || broken(!b && GetLastError() == ERROR_INVALID_PARAMETER), "write failed: %lu\n", GetLastError()); + bytes_read = 0xdeadbeef; + b = ReadProcessMemory(hProcess, addr1, src, 0, &bytes_read); + ok(b && !bytes_read, "read failed: %lu\n", GetLastError()); + /* test invalid source buffers */ b = VirtualProtect( src + 0x2000, 0x2000, PAGE_NOACCESS, &old_prot ); diff --git a/server/process.c b/server/process.c index b6c21d15752..349aa87be3d 100644 --- a/server/process.c +++ b/server/process.c @@ -1659,7 +1659,6 @@ DECL_HANDLER(write_process_memory) { data_size_t len = get_req_data_size(); if (len) write_process_memory( process, req->addr, len, get_req_data() ); - else set_error( STATUS_INVALID_PARAMETER ); release_object( process ); } }

1 0

Paul Gofman : nsiproxy.sys: Fix ipv6 route table parsing on Linux.
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: ee069253197a518d3226843f7f23f41c6fe1ef3b URL: https://gitlab.winehq.org/wine/wine/-/commit/ee069253197a518d3226843f7f23f4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 23 19:13:16 2024 -0600 nsiproxy.sys: Fix ipv6 route table parsing on Linux. --- dlls/nsiproxy.sys/ip.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index fe49caa6e57..09f033ac634 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -1544,7 +1544,7 @@ struct in6_addr str_to_in6_addr(char *nptr, char **endptr) for (int i = 0; i < sizeof(ret); i++) { - if (!isxdigit( *nptr ) || !isxdigit( *nptr + 1 )) + if (!isxdigit( *nptr ) || !isxdigit( *(nptr + 1) )) { /* invalid hex string */ if (endptr) *endptr = nptr; @@ -1574,7 +1574,7 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, UINT key_size, void #ifdef __linux__ { - char buf[512], *ptr; + char buf[512], *ptr, *end; UINT rtf_flags; FILE *fp; @@ -1582,9 +1582,6 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, UINT key_size, void while ((ptr = fgets( buf, sizeof(buf), fp ))) { - while (!isspace( *ptr )) ptr++; - *ptr++ = '\0'; - entry.prefix = str_to_in6_addr( ptr, &ptr ); entry.prefix_len = strtoul( ptr + 1, &ptr, 16 ); str_to_in6_addr( ptr + 1, &ptr ); /* source network, skip */ @@ -1597,6 +1594,10 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, UINT key_size, void entry.protocol = (rtf_flags & RTF_GATEWAY) ? MIB_IPPROTO_NETMGMT : MIB_IPPROTO_LOCAL; entry.loopback = entry.protocol == MIB_IPPROTO_LOCAL && entry.prefix_len == 32; + while (isspace( *ptr )) ptr++; + end = ptr; + while (*end && !isspace(*end)) ++end; + *end = 0; if (!convert_unix_name_to_luid( ptr, &entry.luid )) continue; if (!convert_luid_to_index( &entry.luid, &entry.if_index )) continue;

1 0

Paul Gofman : iphlpapi: Partially fill Ipv4 / Ipv6 metric in GetAdaptersAddresses().
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: fbd6b2583dc979f47438af5c8dfb502d67f5d612 URL: https://gitlab.winehq.org/wine/wine/-/commit/fbd6b2583dc979f47438af5c8dfb50… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 23 17:49:43 2024 -0600 iphlpapi: Partially fill Ipv4 / Ipv6 metric in GetAdaptersAddresses(). --- dlls/iphlpapi/iphlpapi_main.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 343cc2345d2..85048f7a026 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -993,6 +993,7 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG { struct nsi_ipv4_forward_key *key4; struct nsi_ipv6_forward_key *key6; + struct nsi_ip_forward_rw *rw; IP_ADAPTER_GATEWAY_ADDRESS *gw, **gw_next; IP_ADAPTER_PREFIX *prefix, **prefix_next; DWORD err, count, i, prefix_len, key_size = (family == AF_INET) ? sizeof(*key4) : sizeof(*key6); @@ -1002,11 +1003,14 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG void *key; err = NsiAllocateAndGetTable( 1, ip_module_id( family ), NSI_IP_FORWARD_TABLE, &key, key_size, - NULL, 0, NULL, 0, NULL, 0, &count, 0 ); + (void **)&rw, sizeof(*rw), NULL, 0, NULL, 0, &count, 0 ); if (err) return err; while (aa) { + if (family == AF_INET) aa->Ipv4Metric = ~0u; + else aa->Ipv6Metric = ~0u; + for (gw_next = &aa->FirstGatewayAddress; *gw_next; gw_next = &(*gw_next)->Next) ; for (prefix_next = &aa->FirstPrefix; *prefix_next; prefix_next = &(*prefix_next)->Next) @@ -1019,6 +1023,12 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG luid = (family == AF_INET) ? &key4->luid : &key6->luid; if (luid->Value != aa->Luid.Value) continue; + if (rw[i].metric) + { + if (family == AF_INET) aa->Ipv4Metric = min( aa->Ipv4Metric, rw[i].metric ); + else aa->Ipv6Metric = min( aa->Ipv6Metric, rw[i].metric ); + } + if (flags & GAA_FLAG_INCLUDE_GATEWAYS) { memset( &sockaddr, 0, sizeof(sockaddr) ); @@ -1103,7 +1113,7 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG } err: - NsiFreeTable( key, NULL, NULL, NULL ); + NsiFreeTable( key, rw, NULL, NULL ); return err; } @@ -1269,11 +1279,8 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD if (err) goto err; } - if (flags & (GAA_FLAG_INCLUDE_GATEWAYS | GAA_FLAG_INCLUDE_PREFIX)) - { - err = call_families( gateway_and_prefix_addresses_alloc, aa, family, flags ); - if (err) goto err; - } + err = call_families( gateway_and_prefix_addresses_alloc, aa, family, flags ); + if (err) goto err; err = dns_info_alloc( aa, family, flags ); if (err) goto err;

1 0

Hans Leidekker : netprofm: Support NLM_ENUM_NETWORK flags.
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 635e0566a331e0ccb0b9445e0252fed0c5840eaf URL: https://gitlab.winehq.org/wine/wine/-/commit/635e0566a331e0ccb0b9445e0252fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 26 13:07:34 2024 +0100 netprofm: Support NLM_ENUM_NETWORK flags. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56271 --- dlls/netprofm/list.c | 37 ++++++++++++++++++++++++++++--------- dlls/netprofm/tests/list.c | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 60 insertions(+), 16 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index cb65484485b..d6eb1265ac5 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -684,6 +684,7 @@ struct networks_enum LONG refs; struct list_manager *mgr; struct list *cursor; + NLM_ENUM_NETWORK flags; }; static inline struct networks_enum *impl_from_IEnumNetworks( @@ -792,6 +793,17 @@ static HRESULT WINAPI networks_enum_get__NewEnum( return E_NOTIMPL; } +static BOOL match_enum_network_flags( NLM_ENUM_NETWORK flags, struct network *network ) +{ + if (flags == NLM_ENUM_NETWORK_ALL) return TRUE; + if (network->connected) + { + if (flags & NLM_ENUM_NETWORK_CONNECTED) return TRUE; + } + else if (flags & NLM_ENUM_NETWORK_DISCONNECTED) return TRUE; + return FALSE; +} + static HRESULT WINAPI networks_enum_Next( IEnumNetworks *iface, ULONG count, INetwork **ret, ULONG *fetched ) { @@ -806,10 +818,13 @@ static HRESULT WINAPI networks_enum_Next( while (iter->cursor && i < count) { struct network *network = LIST_ENTRY( iter->cursor, struct network, entry ); - ret[i] = &network->INetwork_iface; - INetwork_AddRef( ret[i] ); + if (match_enum_network_flags( iter->flags, network )) + { + ret[i] = &network->INetwork_iface; + INetwork_AddRef( ret[i] ); + i++; + } iter->cursor = list_next( &iter->mgr->networks, iter->cursor ); - i++; } if (fetched) *fetched = i; @@ -826,10 +841,14 @@ static HRESULT WINAPI networks_enum_Skip( if (!count) return S_OK; if (!iter->cursor) return S_FALSE; - while (count--) + for (;;) { + struct network *network; iter->cursor = list_next( &iter->mgr->networks, iter->cursor ); if (!iter->cursor) break; + network = LIST_ENTRY( iter->cursor, struct network, entry ); + if (match_enum_network_flags( iter->flags, network )) count--; + if (!count) break; } return count ? S_FALSE : S_OK; @@ -847,7 +866,7 @@ static HRESULT WINAPI networks_enum_Reset( } static HRESULT create_networks_enum( - struct list_manager *, IEnumNetworks** ); + struct list_manager *, NLM_ENUM_NETWORK, IEnumNetworks ** ); static HRESULT WINAPI networks_enum_Clone( IEnumNetworks *iface, IEnumNetworks **ret ) @@ -855,7 +874,7 @@ static HRESULT WINAPI networks_enum_Clone( struct networks_enum *iter = impl_from_IEnumNetworks( iface ); TRACE( "%p, %p\n", iter, ret ); - return create_networks_enum( iter->mgr, ret ); + return create_networks_enum( iter->mgr, iter->flags, ret ); } static const IEnumNetworksVtbl networks_enum_vtbl = @@ -875,7 +894,7 @@ static const IEnumNetworksVtbl networks_enum_vtbl = }; static HRESULT create_networks_enum( - struct list_manager *mgr, IEnumNetworks **ret ) + struct list_manager *mgr, NLM_ENUM_NETWORK flags, IEnumNetworks **ret ) { struct networks_enum *iter; @@ -886,6 +905,7 @@ static HRESULT create_networks_enum( iter->cursor = list_head( &mgr->networks ); iter->mgr = mgr; INetworkListManager_AddRef( &mgr->INetworkListManager_iface ); + iter->flags = flags; iter->refs = 1; *ret = &iter->IEnumNetworks_iface; @@ -1227,9 +1247,8 @@ static HRESULT WINAPI list_manager_GetNetworks( struct list_manager *mgr = impl_from_INetworkListManager( iface ); TRACE( "%p, %x, %p\n", iface, Flags, ppEnumNetwork ); - if (Flags) FIXME( "flags %08x not supported\n", Flags ); - return create_networks_enum( mgr, ppEnumNetwork ); + return create_networks_enum( mgr, Flags, ppEnumNetwork ); } static HRESULT WINAPI list_manager_GetNetwork( diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index b58aef9bdec..05b6851a2d8 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -380,15 +380,40 @@ static void test_INetworkListManager( void ) network_iter = NULL; hr = INetworkListManager_GetNetworks( mgr, NLM_ENUM_NETWORK_ALL, &network_iter ); ok( hr == S_OK, "got %08lx\n", hr ); - if (network_iter) + ok(network_iter != NULL, "network_iter not set\n"); + while ((hr = IEnumNetworks_Next( network_iter, 1, &network, NULL )) == S_OK) { - while ((hr = IEnumNetworks_Next( network_iter, 1, &network, NULL )) == S_OK) - { - test_INetwork( network, NULL ); - INetwork_Release( network ); - } - IEnumNetworks_Release( network_iter ); + connected = 1; + hr = INetwork_get_IsConnected( network, &connected ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( connected == -1 || connected == 0, "got %d\n", connected ); + INetwork_Release( network ); + } + IEnumNetworks_Release( network_iter ); + + hr = INetworkListManager_GetNetworks( mgr, NLM_ENUM_NETWORK_CONNECTED, &network_iter ); + ok( hr == S_OK, "got %08lx\n", hr ); + while ((hr = IEnumNetworks_Next( network_iter, 1, &network, NULL )) == S_OK) + { + connected = 0; + hr = INetwork_get_IsConnected( network, &connected ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( connected == -1, "got %d\n", connected ); + INetwork_Release( network ); + } + IEnumNetworks_Release( network_iter ); + + hr = INetworkListManager_GetNetworks( mgr, NLM_ENUM_NETWORK_DISCONNECTED, &network_iter ); + ok( hr == S_OK, "got %08lx\n", hr ); + while ((hr = IEnumNetworks_Next( network_iter, 1, &network, NULL )) == S_OK) + { + connected = -1; + hr = INetwork_get_IsConnected( network, &connected ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( connected == 0, "got %d\n", connected ); + INetwork_Release( network ); } + IEnumNetworks_Release( network_iter ); conn_iter = NULL; hr = INetworkListManager_GetNetworkConnections( mgr, &conn_iter );

1 0

Hans Leidekker : netprofm: Set return pointer to NULL in networks_enum_Next().
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: d2df3c2c21f02a23a5c852c83f26e2bd7483d80f URL: https://gitlab.winehq.org/wine/wine/-/commit/d2df3c2c21f02a23a5c852c83f26e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 26 15:23:51 2024 +0100 netprofm: Set return pointer to NULL in networks_enum_Next(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56271 --- dlls/netprofm/list.c | 2 ++ dlls/netprofm/tests/list.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index d6eb1265ac5..31534c7f4b9 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -812,6 +812,8 @@ static HRESULT WINAPI networks_enum_Next( TRACE( "%p, %lu %p %p\n", iter, count, ret, fetched ); + if (!ret) return E_POINTER; + *ret = NULL; if (fetched) *fetched = 0; if (!count) return S_OK; diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 05b6851a2d8..bb3d0f59be8 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -381,14 +381,21 @@ static void test_INetworkListManager( void ) hr = INetworkListManager_GetNetworks( mgr, NLM_ENUM_NETWORK_ALL, &network_iter ); ok( hr == S_OK, "got %08lx\n", hr ); ok(network_iter != NULL, "network_iter not set\n"); + hr = IEnumNetworks_Next( network_iter, 0, NULL, NULL ); + ok( hr == E_POINTER, "got %08lx\n", hr ); + network = (INetwork *)0xdeadbeef; while ((hr = IEnumNetworks_Next( network_iter, 1, &network, NULL )) == S_OK) { + ok( network != (INetwork *)0xdeadbeef, "network not set\n" ); connected = 1; hr = INetwork_get_IsConnected( network, &connected ); ok( hr == S_OK, "got %08lx\n", hr ); ok( connected == -1 || connected == 0, "got %d\n", connected ); INetwork_Release( network ); + network = (INetwork *)0xdeadbeef; } + ok( hr == S_FALSE, "got %08lx\n", hr ); + ok( network == NULL, "network not set\n" ); IEnumNetworks_Release( network_iter ); hr = INetworkListManager_GetNetworks( mgr, NLM_ENUM_NETWORK_CONNECTED, &network_iter );

1 0

Hans Leidekker : wbemprox: Handle implicit property in object path.
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 4cc9ee7e6747a4df3c7b93c95eed4f8fcadbf8ec URL: https://gitlab.winehq.org/wine/wine/-/commit/4cc9ee7e6747a4df3c7b93c95eed4f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 23 13:37:46 2024 +0100 wbemprox: Handle implicit property in object path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55619 --- dlls/wbemprox/services.c | 54 ++++++++++++++++++++++++++++++++-------- dlls/wbemprox/table.c | 21 ++++++++++++++++ dlls/wbemprox/tests/query.c | 14 +++++++++-- dlls/wbemprox/wbemprox_private.h | 5 ++-- 4 files changed, 79 insertions(+), 15 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 436097c1e8d..53b731d8b10 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -336,6 +336,14 @@ static HRESULT WINAPI wbem_services_QueryObjectSink( return WBEM_E_FAILED; } +void free_path( struct path *path ) +{ + if (!path) return; + free( path->class ); + free( path->filter ); + free( path ); +} + HRESULT parse_path( const WCHAR *str, struct path **ret ) { struct path *path; @@ -391,7 +399,7 @@ HRESULT parse_path( const WCHAR *str, struct path **ret ) } q = p; - while (*p && *p != '.') p++; + while (*p && *p != '.' && *p != '=') p++; len = p - q; if (!(path->class = malloc( (len + 1) * sizeof(WCHAR) ))) @@ -411,26 +419,50 @@ HRESULT parse_path( const WCHAR *str, struct path **ret ) len = q - p; if (!(path->filter = malloc( (len + 1) * sizeof(WCHAR) ))) { - free( path->class ); - free( path ); + free_path( path ); return E_OUTOFMEMORY; } memcpy( path->filter, p, len * sizeof(WCHAR) ); path->filter[len] = 0; path->filter_len = len; } + else if (p[0] == '=' && p[1]) + { + WCHAR *key; + UINT len_key; + + while (*q) q++; + len = q - p; + + if (!(key = get_first_key_property( WBEMPROX_NAMESPACE_CIMV2, path->class ))) + { + free_path( path ); + return WBEM_E_INVALID_OBJECT_PATH; + } + len_key = wcslen( key ); + + if (!(path->filter = malloc( (len + len_key + 1) * sizeof(WCHAR) ))) + { + free( key ); + free_path( path ); + return E_OUTOFMEMORY; + } + wcscpy( path->filter, key ); + memcpy( path->filter + len_key, p, len * sizeof(WCHAR) ); + path->filter_len = len + len_key; + path->filter[path->filter_len] = 0; + free( key ); + } + else if (p[0]) + { + free_path( path ); + return WBEM_E_INVALID_OBJECT_PATH; + } + *ret = path; return S_OK; } -void free_path( struct path *path ) -{ - if (!path) return; - free( path->class ); - free( path->filter ); - free( path ); -} - WCHAR *query_from_path( const struct path *path ) { static const WCHAR selectW[] = L"SELECT * FROM %s WHERE %s"; diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 67f57878ea5..573cf035245 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -449,3 +449,24 @@ BSTR get_method_name( enum wbm_namespace ns, const WCHAR *class, UINT index ) release_table( table ); return NULL; } + +WCHAR *get_first_key_property( enum wbm_namespace ns, const WCHAR *class ) +{ + struct table *table; + WCHAR *ret = NULL; + UINT i; + + if (!(table = find_table( ns, class ))) return NULL; + + for (i = 0; i < table->num_cols; i++) + { + if (table->columns[i].type & COL_FLAG_KEY) + { + ret = wcsdup( table->columns[i].name ); + break; + } + } + + release_table( table ); + return ret; +} diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index f5a3c2a14cd..f06e0a431ea 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -2286,8 +2286,7 @@ static void test_SystemRestore( IWbemServices *services ) static void test_Win32_LogicalDisk( IWbemServices *services ) { - BSTR wql = SysAllocString( L"wql" ); - BSTR query = SysAllocString( L"SELECT * FROM Win32_LogicalDisk" ); + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_LogicalDisk" ); IEnumWbemClassObject *result; IWbemClassObject *obj; HRESULT hr; @@ -2329,6 +2328,17 @@ static void test_Win32_LogicalDisk( IWbemServices *services ) IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); SysFreeString( query ); + + query = SysAllocString( L"Win32_LogicalDisk = \"C:\"" ); + hr = IWbemServices_GetObject( services, query, 0, NULL, &obj, NULL ); + ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %#lx\n", hr ); + SysFreeString( query ); + + query = SysAllocString( L"Win32_LogicalDisk=\"C:\"" ); + hr = IWbemServices_GetObject( services, query, 0, NULL, &obj, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + IWbemClassObject_Release( obj ); + SysFreeString( query ); SysFreeString( wql ); } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 8e065bee0b9..655e3db27c2 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -241,8 +241,9 @@ VARTYPE to_vartype( CIMTYPE ); void destroy_array( struct array *, CIMTYPE ); BOOL is_result_prop( const struct view *, const WCHAR * ); HRESULT get_properties( const struct view *, UINT, LONG, SAFEARRAY ** ); -HRESULT get_object( enum wbm_namespace ns, const WCHAR *, IWbemClassObject ** ); -BSTR get_method_name( enum wbm_namespace ns, const WCHAR *, UINT ); +HRESULT get_object( enum wbm_namespace, const WCHAR *, IWbemClassObject ** ); +BSTR get_method_name( enum wbm_namespace, const WCHAR *, UINT ); +WCHAR *get_first_key_property( enum wbm_namespace, const WCHAR * ); void set_variant( VARTYPE, LONGLONG, void *, VARIANT * ); HRESULT create_signature( enum wbm_namespace ns, const WCHAR *, const WCHAR *, enum param_direction, IWbemClassObject ** );

1 0

Paul Gofman : wbemprox: Force debug info in critical sections.
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 0d51cce2fb6b5828b663805d72ed35d201c328e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d51cce2fb6b5828b663805d72ed35… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 09:22:43 2024 -0600 wbemprox: Force debug info in critical sections. --- dlls/wbemprox/services.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 53b731d8b10..3b55a534de9 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -992,7 +992,7 @@ HRESULT WbemServices_create( const WCHAR *namespace, IWbemContext *context, LPVO ws->IWbemServices_iface.lpVtbl = &wbem_services_vtbl; ws->refs = 1; ws->ns = ns; - InitializeCriticalSection( &ws->cs ); + InitializeCriticalSectionEx( &ws->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ws->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": wbemprox_services.cs"); if (context) IWbemContext_Clone( context, &ws->context );

1 0