[PATCH 0/1] MR6350: nsiproxy: Add linux guards for the IPv6 forward info.

[Huw Davies (＠huw)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6350

[PATCH 1/1] nsiproxy: Add linux guards for the IPv6 forward info.

[Huw Davies]

From: Huw Davies <huw(a)codeweavers.com>

---
 dlls/nsiproxy.sys/ip.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c
index 43c9ad9e9fe..32ba6241761 100644
--- a/dlls/nsiproxy.sys/ip.c
+++ b/dlls/nsiproxy.sys/ip.c
@@ -1482,6 +1482,7 @@ static NTSTATUS ipv4_forward_enumerate_all( void *key_data, UINT key_size, void
     return status;
 }
 
+#ifdef __linux__
 struct ipv6_route_data
 {
     NET_LUID luid;
@@ -1537,6 +1538,7 @@ static void ipv6_forward_fill_entry( struct ipv6_route_data *entry, struct nsi_i
         stat->if_index = entry->if_index;
     }
 }
+#endif
 
 struct in6_addr str_to_in6_addr(char *nptr, char **endptr)
 {
@@ -1567,13 +1569,13 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, UINT key_size, void
     UINT num = 0;
     NTSTATUS status = STATUS_SUCCESS;
     BOOL want_data = key_size || rw_size || dynamic_size || static_size;
-    struct ipv6_route_data entry;
 
     TRACE( "%p %d %p %d %p %d %p %d %p\n" , key_data, key_size, rw_data, rw_size,
         dynamic_data, dynamic_size, static_data, static_size, count );
 
 #ifdef __linux__
     {
+        struct ipv6_route_data entry;
         char buf[512], *ptr, *end;
         UINT rtf_flags;
         FILE *fp;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6350

[PATCH 1/1] nsiproxy: Add linux guards for the IPv6 forward info.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=147979

Your paranoid android.


=== debian11b (64 bit WoW report) ===

user32:
input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 00000000009000DC, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032